Doctest fixups