Wq policy fixes

@dpandiar, @rampantmonkey