Further changes to compile/run on Windows #16