More queuing changes