In-game testing fixes

Still a little broken in some areas