Uncomment the updater queries

* A few other random cleanups