Fix saving thing-scoped keys