Improve queueing to handle overflows