Queue and CF fixes