Fixing Javadoc generation