Fixing some issues with toroidal surface geometries