H1B approve with Incorrect Citizenship-Country name

I am living in USA since last 2-year on TN-Visa.
This year I applied for H1B-Visa, and I got my H-1B approval paper on last week.
In my H-1B Approval notices(I-797A)I-94: states that "my country of citizenship is My Birth Country, instead of Canada".

My Attorney told me that it is not a big deal, It can easily be corrected upon my request and show my Canadian-Passport to Customs & Border Protection Officer on my next trip at Border/or Embassy. and officer will change my Country of Citizenship to Canada.(I was apply H1B-visa on my Canadian Passport)

Q1). Where I go to stamping of my H1B visa. (it stamp on Canadian Border or I book an appointment in Vancouver-USA-Embassy).

Q2). My Friends tell me that at Border or Embassy, its very difficult to change anything, like here Country of Citizenship".

IS anybody face same kind of problem?