Data Access fixes