* Some more Windows changes