Fixing issues in Settings.apk