I agree that we should not register the pipe locks. I missed that. In the other integration points, I match on riak_kv_vnode and I think we should do the same here. There are plenty of other places in core that do the same thing - it's not like kv is completely isolated from core. I have run riak tests with this configuration and it works fine with handoff.