Fix thread issue + menu issue + clean warning !!!