SportBundle and ShiftBundle fixes and improvements