Fixed some collision bugs