Fix windows and mac builds