Minor windows fixes