Minor fixes, javadoc issues