Damn it! More fixes for DB