Fixed a couple of jdk reference issues