checkout form fixes