Updates to Mac super build