Some simple namespace fixes.

Also a few wstring fixes.