Fixes for Android build.