Various NRCan field fixes