Made some windows-specific adjustments