correct persistence domain issues