Michal&Seema: More fixes after merge