Engine::some fixes and improvements