Fix delete and user editable keys.