Fixed couple remaining issues with queue handling