Fixed some melee things