Pre-game bugfixes