Minor fixes on queue module