Update for OSX fixes. Adds support for Oracle's JVM.