Fixing packaging and javadoc issues