geos: Some fixes.