Another try at fixing doctest exceptions