Adding fixes suggested by Slava