Finish up queue handling