BAC-1265 more code review fixes