Small updates to the database classes as a result of some tests.