Fixed some collision problems