fixes for GEOS-5482 backporting