Some queue improvements.