Fix for master re datastore and auth audit