Fixes to build in Windows