Integrated a couple minor changes from the cards in the upstream repository.