card final step fixes