Fixes for shapes intersections