Finish up conduit support in NIO, fix last test regressions