Yet another set of jdoc fixes