minor fixes in queue