Minor tweaks so doctests run properly