Fireball fixes