Fix some mach0 crashes