Geometry bug fixes.