diff --git a/app/build.gradle b/app/build.gradle
index cb42efa..cc0543b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "news.androidtv.tvapprepo"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 14
-        versionName "1.1.1-dev"
+        versionCode 15
+        versionName "1.1.2"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/news/androidtv/tvapprepo/activities/AdvancedShortcutActivity.java b/app/src/main/java/news/androidtv/tvapprepo/activities/AdvancedShortcutActivity.java
index 80e3a1e..2ff1a27 100644
--- a/app/src/main/java/news/androidtv/tvapprepo/activities/AdvancedShortcutActivity.java
+++ b/app/src/main/java/news/androidtv/tvapprepo/activities/AdvancedShortcutActivity.java
@@ -86,7 +86,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         }
 
         if (advancedOptions == null) {
-            advancedOptions = new AdvancedOptions(this);
+            advancedOptions = new AdvancedOptions(getApplicationContext());
         }
 
         loadCustomIconography();
diff --git a/app/src/main/java/news/androidtv/tvapprepo/utils/GenerateShortcutHelper.java b/app/src/main/java/news/androidtv/tvapprepo/utils/GenerateShortcutHelper.java
index 6217eae..8b4c3fd 100644
--- a/app/src/main/java/news/androidtv/tvapprepo/utils/GenerateShortcutHelper.java
+++ b/app/src/main/java/news/androidtv/tvapprepo/utils/GenerateShortcutHelper.java
@@ -1,22 +1,14 @@
 package news.androidtv.tvapprepo.utils;
 
 import android.app.Activity;
-import android.app.Dialog;
-import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.v7.app.AlertDialog;
-import android.text.Layout;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.Switch;
 import android.widget.Toast;
 
 import com.android.volley.NetworkResponse;
@@ -35,8 +27,6 @@
 import news.androidtv.tvapprepo.R;
 import news.androidtv.tvapprepo.activities.AdvancedShortcutActivity;
 import news.androidtv.tvapprepo.download.ApkDownloadHelper;
-import news.androidtv.tvapprepo.iconography.IconsTask;
-import news.androidtv.tvapprepo.iconography.PackedIcon;
 import news.androidtv.tvapprepo.model.AdvancedOptions;
 
 /**
diff --git a/app/src/main/java/tv/puppetmaster/tinydl/PackageInstaller.java b/app/src/main/java/tv/puppetmaster/tinydl/PackageInstaller.java
index f095a4c..9a90cf4 100644
--- a/app/src/main/java/tv/puppetmaster/tinydl/PackageInstaller.java
+++ b/app/src/main/java/tv/puppetmaster/tinydl/PackageInstaller.java
@@ -285,9 +285,11 @@ protected Integer doInBackground(String... urls) {
                         (DownloadManager) mActivity.getSystemService(Context.DOWNLOAD_SERVICE);
                 manager.enqueue(request);
             } catch (Exception e) {
-                Toast.makeText(mActivity, e.getMessage(), Toast.LENGTH_SHORT).show();
+                Toast.makeText(mActivity.getApplicationContext(), e.getMessage(),
+                        Toast.LENGTH_SHORT).show();
                 // Tell user about an error and throw with additional debug info.
-                throw new RuntimeException(e.getMessage() + ": " + downloadedFileName + ", " + urls[0] + ", " + DOWNLOADS_DIRECTORY.toString());
+                throw new RuntimeException(e.getMessage() + ": " + downloadedFileName + ", " +
+                        urls[0] + ", " + DOWNLOADS_DIRECTORY.toString());
             }
             Log.i(TAG, "Download request for " + urls[0] + " enqueued");
             Log.d(TAG, "Should be saved to " + downloadedFileName);