Fixing some issues related to Sphinx documentation.   ORM model fixes.