Minor improvements in the javadoc

(cherry picked from commit fe0686f6ec38b5016a5ed96722e7acd2443f5f12)