Fix persistency problems