Engine::some small improvements