Fixes for Windows install

@IainNZ