diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index d7553221..f5aa0373 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -61,7 +61,7 @@
 		</activity>
 		<activity
 				android:name=".gui.FolderPickerActivity"
-				android:label="@string/title_activity_folder_picker" >
+				android:label="@string/folder_picker_title" >
 			<meta-data
 					android:name="android.support.PARENT_ACTIVITY"
 					android:value=".gui.RepoSettingsActivity" />
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java
index 56f222ca..aad97351 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java
@@ -1,5 +1,7 @@
 package com.nutomic.syncthingandroid.gui;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.Context;
@@ -67,6 +69,8 @@ public class NodeSettingsActivity extends PreferenceActivity implements
 	private Preference mDelete;
 
 	@Override
+	@SuppressLint("AppCompatMethod")
+	@TargetApi(11)
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
index 0211968e..ed0ebd05 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
@@ -1,5 +1,7 @@
 package com.nutomic.syncthingandroid.gui;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -78,6 +80,8 @@ public class RepoSettingsActivity extends PreferenceActivity
 	private Preference mDelete;
 
 	@Override
+	@SuppressLint("AppCompatMethod")
+	@TargetApi(11)
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
index 476b739f..dc80648d 100644
--- a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -64,6 +64,7 @@ public class ConfigXml {
 	 *
 	 * Coming from 0.3.0 and earlier, the ignorePerms flag is set to true on every repository.
 	 */
+	@SuppressWarnings("SdCardPath")
 	public void update() {
 		Log.i(TAG, "Checking for needed config updates");
 		boolean changed = false;
diff --git a/src/main/res/menu/folder_picker.xml b/src/main/res/menu/folder_picker.xml
index b6383bc8..9007609d 100644
--- a/src/main/res/menu/folder_picker.xml
+++ b/src/main/res/menu/folder_picker.xml
@@ -4,10 +4,10 @@
 
 	<item
 			android:id="@+id/create_folder"
-			android:title="Create Folder" />
+			android:title="@string/create_folder" />
 
 	<item
 			android:id="@+id/select"
-			android:title="Select" />
+			android:title="@string/select_folder" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9e4036f1..ddf53d60 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -185,6 +185,7 @@ Please report any problems you encounter.</string>
 	<!-- SettingsActivity -->
 
 
+	<!-- Activity title -->
 	<string name="settings_title">Settings</string>
 
 	<!-- Settings item that opens issue tracker -->
@@ -201,11 +202,18 @@ Please report any problems you encounter.</string>
 
 	<!-- FolderPickerAcitivity -->
 
+	<!-- Activity title -->
+	<string name="folder_picker_title">Folder Picker</string>
 
+	<!-- ListView empty text -->
 	<string name="directory_empty">Directory is Empty</string>
 
+	<!-- Menu item to create folder -->
 	<string name="create_folder">Create new Folder</string>
 
+	<!-- Menu item to select the current folder -->
+	<string name="select_folder">Select Folder</string>
+
 	<!-- RestApi -->
 
 
@@ -227,8 +235,4 @@ Please report any problems you encounter.</string>
 		<item>Tb/s</item>
 	</string-array>
 
-	<string name="title_activity_folder_picker">FolderPickerActivity</string>
-	<string name="hello_world">Hello world!</string>
-	<string name="action_settings">Settings</string>
-
 </resources>