Changes to allow windows specific code to work with the current upstream changes