Merge "Fix windows build"