Remaining hitbox fixes