Fixes according to Yuri requests