Fix CL for JDK classes, #2.