Minor updates relating to Database.java changes