More doctest fixes