Fixed database and build