Merge Windows fixes.