Fixes for Android.