More fixes to card json