Fix class mismatch in newly-added keys and data saving code.