Nailed one or two more failing doctests