Improvements for the Windows context