Updates to Wet4 Branch for canada.ca and geomap fix