Queue improvements on workers