Windows: More fixes