GeoTools

Review GeoToolkit fixes