Fixed some of the mach0 regressions