Queuing fixes