Fix DatabaseManager