Melee fixes