Small tweaks to gdal build