OK got it. The $goto change in includes/classes/shopping_cart.php needs to be done for both zen_redirect calls. Posting an update shortly.