Michal&Seema: Fixes after merge