Fix collision layer inconsistancies