Paste in changes from Hitbox Fixes