Less warnings, adapt to latest JavaCL