Adaptions to Postgis 2.0