ENG-6891 Minor fixes