Misc
Some fixes for Windows builds