Trying to fix persistence exceptions