ENG-3236 fix assorted regressions