fixes for persistance environment