Fixes to Geometry