ENG-4528: Fixes from review feedback