fix-up of java classes