More Postgis 2.0 fixes