Some doc fixes to make sphinx build cleanly