Small updates to DatabaseHandler.