ENG-5502: Fix bugs jenkins found.