fixes from compiling code and running all the tests on NT
12 files changed