GEB-321 fixes after code review