Fixes to data store