Fixes bugs where wrong payment method is referenced, and shipping has been already been applied when checking out from cart.