diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index 93635eb3..b61a4278 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -26,7 +26,7 @@
                     <descriptors>
                         <descriptor>src/main/assembly/jar-with-deps.xml</descriptor>
                     </descriptors>
-                    <archive>soc
+                    <archive>
                         <manifest>
                             <mainClass>brut.apktool.Main</mainClass>
                         </manifest>
diff --git a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
index c243883f..bc296cdc 100644
--- a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
@@ -44,7 +44,7 @@ public class SmaliDecoder {
             baksmali.disassembleDexFile(mApkFile.getAbsolutePath(),
                 new DexFile(mApkFile), false, mOutDir.getAbsolutePath(), null,
                 null, null, false, true, true, true, false, false, 
-                mDebug ? main.FULLMERGE : 0, false, false, null);
+                mDebug ? main.DIFFPRE : 0, false, false, null);
         } catch (IOException ex) {
             throw new AndrolibException(ex);
         }