Fixed a few bugs introduced by the collision hitbox refactoring.