Fix checkout page issues