Leftovers of 16 Oct JDK