jdk

afe49659 - cleanup type mismatches