Wq policy fixes

@dpandiar, @rampant-monkey