Fixes for Android
Fix Merge Conflicts