More javadoc fixes

Related to #945