Fix some bugs with collisions.