Other fixes to avoid self-intersections