Minor fixes, mostly for Android.