Fix a couple of small bugs introduced by CardDTOs.

Note: general store was way broken, so it's dummied out for now.