Atsidaev's fixes