Minor tweaking for JVM loading