More fixes from Pavel Pimenov
Undo
More fixes from Pavel Pimenov