diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index af9d734d..57797b47 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -5,10 +5,8 @@
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
   <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
-  <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 
   <uses-feature
       android:name="android.hardware.touchscreen"
diff --git a/src/main/res/xml/tracker.xml b/src/main/res/xml/tracker.xml
index 1d1784c6..3e4e64ca 100644
--- a/src/main/res/xml/tracker.xml
+++ b/src/main/res/xml/tracker.xml
@@ -6,13 +6,18 @@
     <!-- Enable automatic Activity measurement -->
     <bool name="ga_autoActivityTracking">true</bool>
 
+    <!-- Enable exception reports -->
+    <bool name="ga_reportUncaughtExceptions">true</bool>
+
     <!-- The screen names that will appear in reports -->
     <screenName name="com.google.android.gms.analytics.samples.mobileplayground.ScreenviewFragment">
         Shadowsocks ScreenView
     </screenName>
+
     <screenName name="com.google.android.gms.analytics.samples.mobileplayground.EcommerceFragment">
         Shadowsocks EcommerceView
     </screenName>
+
     <!--  The following value should be replaced with correct property id. -->
     <string name="ga_trackingId">UA-37082941-1</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 3cc8c831..ee09ca0c 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -128,11 +128,6 @@ object Shadowsocks {
   // Helper functions
   def updateListPreference(pref: Preference, value: String) {
     pref.asInstanceOf[ListPreference].setValue(value)
-    val entry = pref.asInstanceOf[ListPreference].getEntry
-    if (entry != null)
-      pref.setSummary(entry)
-    else
-      pref.setSummary(value)
   }
 
   def updatePasswordEditTextPreference(pref: Preference, value: String) {
diff --git a/src/main/scala/com/github/shadowsocks/preferences/SummaryListPreference.scala b/src/main/scala/com/github/shadowsocks/preferences/SummaryListPreference.scala
index c45c704d..4cf92bac 100644
--- a/src/main/scala/com/github/shadowsocks/preferences/SummaryListPreference.scala
+++ b/src/main/scala/com/github/shadowsocks/preferences/SummaryListPreference.scala
@@ -56,7 +56,7 @@ class SummaryListPreference(context: Context, attrs: AttributeSet)
   }
 
   override def setSummary(summary: CharSequence) {
-    if (summary.toString.isEmpty) {
+    if (summary == null || summary.toString.isEmpty) {
       super.setSummary("")
     } else {
       super.setSummary(summary)