Fixes by Dmitry Kalinkin (checked by Ivan and Sasha Z.) (reopen after adding Ivan to the list of approvers)