Card select bug fixes