Queue print next fixes