Add bugfixes for GameEngine