Last bits to get windows builds working