Further datastore security imprvoements.