Merge "Fix javadocs a bit"