mochitest-mc fixes