Fix some collision bugs