fixes for javadoc generation