Some db and enumerator changes, cleanup