Update to work with harmony on windows