Patches to aid debugging.