Small changes due to merging and renaming the DB