Fixes to geotools