Improvements to geometry.