diff --git a/android/launcher/Android.mk b/android/launcher/Android.mk
index 354fdaccddf1dbe805d1e7141ae4f01f1d429dff..b6395c0ff1ade96479d3f293bc1bf7c373fd9609 100644
--- a/android/launcher/Android.mk
+++ b/android/launcher/Android.mk
@@ -1,11 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under src)
-LOCAL_SDK_VERSION := current
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := AnboxLauncher
-LOCAL_CERTIFICATE := shared
+LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home
 include $(BUILD_PACKAGE)
diff --git a/android/launcher/AndroidManifest.xml b/android/launcher/AndroidManifest.xml
index 596e6f6c712872ec979f6ad8deb20731387e1b9a..a90a40f1d915dc0f33e6e79710b3ef49677c3cc2 100644
--- a/android/launcher/AndroidManifest.xml
+++ b/android/launcher/AndroidManifest.xml
@@ -4,13 +4,13 @@
     package="org.anbox.launcher">
 
     <application
-        android:name="org.anbox.launcher.LauncherApplication"
+        android:name=".LauncherApplication"
         android:label="Anbox Launcher"
         android:hardwareAccelerated="true"
         android:largeHeap="false"
         android:supportsRtl="true">
         <activity
-            android:name="org.anbox.launcher.Launcher"
+            android:name=".Launcher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
diff --git a/android/launcher/src/org/anbox/launcher/Launcher.java b/android/launcher/src/org/anbox/launcher/Launcher.java
index 3cd98b14f047e17521983ddffb84c6593c6c3af7..989225c98fa72c62dab7773a30f58faa6df7b836 100644
--- a/android/launcher/src/org/anbox/launcher/Launcher.java
+++ b/android/launcher/src/org/anbox/launcher/Launcher.java
@@ -18,6 +18,7 @@
 package org.anbox.launcher;
 
 import android.app.Activity;
+import android.os.Bundle;
 
 /**
  * Default launcher application.
diff --git a/android/launcher/src/org/anbox/launcher/LauncherApplication.java b/android/launcher/src/org/anbox/launcher/LauncherApplication.java
index 629c304b36041703d9683c7df981bb23212455ee..686f9f704a5aacb32ab2e0c8acedbf1bed55bdd3 100644
--- a/android/launcher/src/org/anbox/launcher/LauncherApplication.java
+++ b/android/launcher/src/org/anbox/launcher/LauncherApplication.java
@@ -20,8 +20,6 @@ package org.anbox.launcher;
 import android.app.Application;
 import android.util.Log;
 
-import org.anbox.launcher.R;
-
 public class LauncherApplication extends Application {
     static final String TAG = "LauncherApplication";