Updated windows and mac setups