More tweaks to make standalone libgeotiff work