Fixed some collision stuff