minor changes on queue management