ENGINE-750: Fixes after code review