Small but important fix to `jvm` and begin work to support OS X