Some fixes to javadoc