Fixed some collision issues