Merge "Fix windows and mac build"