Minor fixes for datastore capabilities