Fixing a few things we found in the Android version.