Make --db and --mem-db consistent with version 2