Further fixes to Windows Build