Some SportBundle fixes