Fixes for Android build