ENG-5145: pmartel feedback
ENG-5145: Hopefully fix Valgrind results.