Fixed some collision inconsistencies.