Fixing issues detected by the GeoServer build