Merge changes from my Windows config
Fix typo