Merge w32 changes