Fixing card management issues