fixes for Android build.