Various javadoc fixes