Pregame fixes and improvements