Even moar queuing fixes