Updates to Java conversion script