more warning fixes for Android