Few fixes according to Michal feedback