diff --git a/project.properties b/project.properties
index 5208598164151eb1ec40dd067b14a779cb7f149d..60a7d6fc821a4aac7db2f6a5c5f889d6cbe958be 100644
--- a/project.properties
+++ b/project.properties
@@ -17,4 +17,4 @@ android.library.reference.1=./routerjars
 # If the relative path differs in your local environment,
 # override this in the base local.properties
 # (not routerjars/local.properties)
-android.library.reference.2=../android-sdk-linux/extras/android/support/v7/appcompat
+android.library.reference.2=../../../android/adt-bundle-linux-x86_64/sdk/extras/android/support/v7/appcompat
diff --git a/src/net/i2p/android/router/SettingsActivity.java b/src/net/i2p/android/router/SettingsActivity.java
index 1a5f7fd9a8245628c5ce6abf0eaefc353a4cd6b9..f1cae352a6a205ebc79f3df2fabe2f5cdb4b3400 100644
--- a/src/net/i2p/android/router/SettingsActivity.java
+++ b/src/net/i2p/android/router/SettingsActivity.java
@@ -103,6 +103,10 @@ public class SettingsActivity extends PreferenceActivity {
                     groupPrefs.addPreference(statPref);
                 }
             }
+        } else {
+            PreferenceCategory noRouter = new PreferenceCategory(context);
+            noRouter.setTitle(R.string.router_not_running);
+            ps.addPreference(noRouter);
         }
     }
 
diff --git a/src/net/i2p/android/router/util/Util.java b/src/net/i2p/android/router/util/Util.java
index 1902f9e34fc651d6fd4c45e5a374c97b9038f912..849a3b179a36f25a50b2ab1f3eff9f80b69d8d66 100644
--- a/src/net/i2p/android/router/util/Util.java
+++ b/src/net/i2p/android/router/util/Util.java
@@ -81,9 +81,9 @@ public abstract class Util {
 
     public static void i(String m, Throwable t) {
         I2PAppContext ctx = I2PAppContext.getCurrentContext();
-        if (ctx != null)
+        /*if (ctx != null)
             ctx.logManager().getLog(Util.class).log(Log.INFO, m, t);
-        else if (t != null)
+        else*/ if (t != null)
             android.util.Log.i(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
         else
             android.util.Log.i(ANDROID_TAG, m);