update JDK
Small fixes played back from RapidEnv development