Add a number of fixes on data management