Fix bugs for iOS, Android

Fix bugs for iOS, Android