HACK: Try to avoid occasional mco errors
Fix bugs, but break tests