Several changes in the java module