Fixing order_deliver.php brokenness