Fixed some collisions issues