Fix up the teardown action