Fixes bugs in checkout process for address and service pages