more fixes for removing shp2pgsql