Merge iov fixes from Richard Kettlewell
8 files changed