fix all the env_db consumers