Fixes for compiling under windows
Fixes for compiling under windows