Adapt to new java installer