Changed to unicode - cont'd

See previous commit. Saved minor change in VS2010 after committing.