Make compat for new version of kvstores