DB and Other fixes