MOB-1152: Design fixes