More features of java-fix :)