Fixed issues with javadoc generation