diff --git a/app/build.gradle b/app/build.gradle
index 7a8bf7a1..851d411f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    buildToolsVersion '22.0.0'
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java
index 94ef3a1f..bb01dc25 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java
@@ -638,14 +638,14 @@ public class DfuActivity extends ActionBarActivity implements LoaderCallbacks<Cu
 				index = 0;
 				break;
 			case DfuService.TYPE_SOFT_DEVICE:
-			index = 1;
-			break;
+				index = 1;
+				break;
 			case DfuService.TYPE_BOOTLOADER:
-			index = 2;
-			break;
+				index = 2;
+				break;
 			case DfuService.TYPE_APPLICATION:
-			index = 3;
-			break;
+				index = 3;
+				break;
 		}
 		// Show a dialog with file types
 		new AlertDialog.Builder(this).setTitle(R.string.dfu_file_type_title)
diff --git a/app/src/main/res/values/strings_dfu.xml b/app/src/main/res/values/strings_dfu.xml
index c8643a9d..1364d6d7 100644
--- a/app/src/main/res/values/strings_dfu.xml
+++ b/app/src/main/res/values/strings_dfu.xml
@@ -93,8 +93,7 @@
     <string name="dfu_file_init_message">Do you want to select the Init packet file?\n
 		The Init packet file (*.dat) should contain the device type and revision, application version, list of supported Soft Devices and the firmware CRC
 		in binary format or, with old versions of the DFU bootloader, only the CRC (CRC-CCITT-16).
-		With the new version of the bootloader the extended Init packet is <b>required</b>.
-</string>
+		With the new version of the bootloader the extended Init packet is <b>required</b>.</string>
     
     <string name="dfu_unknown_name">unnamed device</string>
     <string name="dfu_uploading_percentage_label">0%</string>