Bug fixes for multicard matching.