Additional tweaks to fix persistence error.