Javadoc and build fix