iowatcher patches for upstreaming