Fix last changes for TARGET_JVM.