More changes from postgis 1.5