more fixes for checkout