Minor fixes to queue