Updates to FFI spec