Fix some collision issues