Fixing windows builds again. Re #863