Engine::small bugfixes