fixes for checkout issue - round 1