Fixed other FFI issues