Put jdk setup on a sounder footing