ENG-6400 Fixed issues from code review