Minor fixes to allow cross compiling from Linux to windows and running the tests...