Geometry checker fixes