diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
index de16c19..1fd6912 100644
--- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
+++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
@@ -123,7 +123,7 @@ public abstract class AbstractFilePickerFragment<T> extends Fragment
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_filepicker, null);
+        View view = inflater.inflate(R.layout.fragment_filepicker, container);
 
         mToolbar = (Toolbar) view.findViewById(R.id.picker_toolbar);
         ((AppCompatActivity) getActivity()).setSupportActionBar(mToolbar);
diff --git a/library/src/main/res/layout/dialog_folder_name.xml b/library/src/main/res/layout/dialog_folder_name.xml
index 84b5729..7f2f6ca 100644
--- a/library/src/main/res/layout/dialog_folder_name.xml
+++ b/library/src/main/res/layout/dialog_folder_name.xml
@@ -17,6 +17,7 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <EditText
@@ -34,5 +35,5 @@
         android:imeOptions="actionDone"
         style="?android:textAppearanceMedium"
         android:inputType="textAutoComplete|textAutoCorrect"
-        />
+        tools:ignore="UnusedAttribute" />
 </FrameLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/filepicker_listitem_checkable.xml b/library/src/main/res/layout/filepicker_listitem_checkable.xml
index 8d56096..f26620d 100644
--- a/library/src/main/res/layout/filepicker_listitem_checkable.xml
+++ b/library/src/main/res/layout/filepicker_listitem_checkable.xml
@@ -26,6 +26,7 @@
     android:background="@drawable/selectable_background_filepickertheme">
 
 
+    <!--suppress AndroidDomInspection -->
     <ImageView
         android:id="@+id/item_icon"
         android:src="@drawable/ic_file_folder"
@@ -55,6 +56,6 @@
         android:id="@+id/checkbox"
         android:paddingEnd="8dp"
         android:paddingRight="8dp"
-        />
+        tools:ignore="RtlSymmetry" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/filepicker_listitem_dir.xml b/library/src/main/res/layout/filepicker_listitem_dir.xml
index 0962df4..7522ded 100644
--- a/library/src/main/res/layout/filepicker_listitem_dir.xml
+++ b/library/src/main/res/layout/filepicker_listitem_dir.xml
@@ -26,6 +26,7 @@
     android:background="@drawable/selectable_background_filepickertheme"
     >
 
+    <!--suppress AndroidDomInspection -->
     <ImageView
         android:id="@+id/item_icon"
         android:src="@drawable/ic_file_folder"
diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java
index 2cd196a..dc48b4e 100644
--- a/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java
+++ b/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java
@@ -17,6 +17,7 @@
 
 package com.nononsenseapps.filepicker.sample;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.Intent;
@@ -197,6 +198,7 @@ public class NoNonsenseFilePicker extends Activity {
         return id == R.id.action_settings || super.onOptionsItemSelected(item);
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     @Override
     protected void onActivityResult(int requestCode, int resultCode,
                                     Intent data) {
diff --git a/sample/src/main/res/menu/no_nonsense_file_picker.xml b/sample/src/main/res/menu/no_nonsense_file_picker.xml
index 7e503d0..d13c8a4 100644
--- a/sample/src/main/res/menu/no_nonsense_file_picker.xml
+++ b/sample/src/main/res/menu/no_nonsense_file_picker.xml
@@ -17,10 +17,11 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.nononsenseapps.filepicker.sample.NoNonsenseFilePicker" >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="com.nononsenseapps.filepicker.sample.NoNonsenseFilePicker">
     
     <item android:id="@+id/action_settings"
         android:title="@string/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        app:showAsAction="never" />
 </menu>