Wide char fix
Changes and fixes