Fixes in Checkout process

Fixes in Checkout process