Fix mac, windows, linux builds