Geometry improvements.