TN holder filing Canadian tax return

I work in US under TN and have filed the 1040NR & 8840. Now filing Canadian return, I need help in confirming following assumptions:

1. US Employment Income (W-2) = "Non Business Income" on Canadian forms T2209 & T2036?
2. US Federal/State Tax + SS + Medicare = "Non Business Income Tax" on Canadian forms T2209?

Any help will be appreciated. Thanks

I answer tax questions on forums.serbinski.com
I'm wondering why you would file 8840, which has a very narrow sector of people that use this form. You need to have met SPT, but NOT have been in US more than 183 days. This is more for tourists than someone working on TN. If you did not meet SPT, you simply file 1040NR (assuming you do live in Canada), no 8840. If you were in US more than 183 days, 8840 is not permitted, and you would have to submit 8833 treaty claim.

In any event, follow up with me at serbinski on your other questions.