Doctest fixes