US and Canada agree on new migrant rules