Some doc fixes to make sphinx build cleanly

Some doc fixes to make sphinx build cleanly