Some updates and fudges for JVM