queue flow fixes