Fixed persistence issues