More cooldown fixes