Bug fixes for the Enqueue command