RE: Minor tweaks to ffi addendum