OsArch improvements for Linux and Windows
Testsuite build fix for Windows