wsbuild changes and UTF-8 Errors corrected