We need some adjustments here and there, mainly because of https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762