Fixe Android issues