[PATCH 0/2] Improve the validation for queues and queue_size