[RJA-680][fix] fixes for code review comments