Fixed bugs caused by changing CC expiration dates