Misc updates

This database name should be changed too.