Clean up javadoc problems

Miscellaneous corrections to javadoc that get flagged by the build or IDEs.