Fixed several Javadoc generation issues