MOB-1359, fix code review issues