* java class fixes