Issue #235 - Database Utility fixes.