Started fixing doctests