EngineWrapper: fix a few small issues.