G M: Improvements to Windows support.