Fix issues that broke doc build
Further doc style cleanup is on the todo list for now
Merge pull request #2144 from bionoid/docfix

Fix issues that broke doc build