Javadoc fixes
(cherry picked from commit 465e629)
Polishing
(cherry picked from commit caa1218)