Dox fixes

Includes a fix for #691