Engine::some improvements