ENG-4324: Fix stuff that worked locally, but not in jenkins.