Fixed publish and javadoc gen