Minor tweaks for persistency.