Fixes for persistence of data