Fix bugs for iOS, Android