Data access updates which will hopefully fix some problems.