Fix some bug on android