More fixes for Android version.