Fix doctests some more