MOB-548: Bunch of fixes and some qqq