Card handling fixes