Mac version + more script fix