Fixed some bugs on android