[18] Fixed DB connection and rebuild