Fixing up a few more locations using environment variables for the Windows Runtime.