Fix linux and mac