Corrections
Corrections to Windows-specific removals