queue.php fixes