Fix references
Fix persistent key