jdk

5d9f740b - Fix several bookkeeping errors