Fix javadocs
Merge pull request #1358 from xoppa/various

Fix javadocs