Merge: More tweaks to support the Java FFI on turing