Patched up doctests