Tested changes for wchar