more doctest fixes