Fixed some collisions.