Adjust to default-jdk