Minor fixes with GDAL