More pregame fixes