[FIX] Correct some bug in creation for new database