fixes for backporting GEOS-5482