More queue updates and changes