Minor fixes to get doctests running.