Updates to try and resolve postGIS 1.5 issues.