Fix queue per vnode

These are the fixes needed to make the recent set of changes (#98, #95) actually work.