Fixing CAL Issuance and Upgrade Problems