diff --git a/package.sh b/package.sh
index 57726525..89745cc1 100755
--- a/package.sh
+++ b/package.sh
@@ -66,6 +66,25 @@ if [ "$BUILD_TARGET" = "all" ]; then
 	exit
 fi
 
+# Change working directory to the directory the script is in
+# http://stackoverflow.com/a/246128
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_DIR
+
+checkTool git "git: http://git-scm.com/"
+checkTool curl "curl: http://curl.haxx.se/"
+if [ $BUILD_TARGET = "win32" ]; then
+	#Check if we have 7zip, needed to extract and packup a bunch of packages for windows.
+	checkTool 7z "7zip: http://www.7-zip.org/"
+fi
+#For building under MacOS we need gnutar instead of tar
+if [ -z `which gnutar` ]; then
+	TAR=tar
+else
+	TAR=gnutar
+fi
+
+
 #############################
 # Darwin
 #############################
@@ -88,7 +107,9 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
 	cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
 
 	# Archive app
-	$TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz
+	cd dist
+	$TAR cfp - Cura.app | gzip --best -c > ../../../${TARGET_DIR}.tar.gz
+	cd ..
 
 	# Create sparse image for distribution
 	hdiutil detach /Volumes/Cura\ -\ Ultimaker/
@@ -102,28 +123,11 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
 	exit
 fi
 
+
 #############################
 # Rest
 #############################
 
-# Change working directory to the directory the script is in
-# http://stackoverflow.com/a/246128
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR
-
-checkTool git "git: http://git-scm.com/"
-checkTool curl "curl: http://curl.haxx.se/"
-if [ $BUILD_TARGET = "win32" ]; then
-	#Check if we have 7zip, needed to extract and packup a bunch of packages for windows.
-	checkTool 7z "7zip: http://www.7-zip.org/"
-fi
-#For building under MacOS we need gnutar instead of tar
-if [ -z `which gnutar` ]; then
-	TAR=tar
-else
-	TAR=gnutar
-fi
-
 #############################
 # Download all needed files.
 #############################
diff --git a/setup.py b/setup.py
index bde74778..1cf22659 100644
--- a/setup.py
+++ b/setup.py
@@ -18,19 +18,19 @@ if sys.platform.startswith('darwin'):
             {
                 u'CFBundleTypeRole': u'Viewer',
                 u'LSItemContentTypes': [u'com.pleasantsoftware.uti.stl'],
-                u'LSHandlerRank': u'Alternate',
+                u'LSHandlerRank': u'Owner',
                 },
             {
                 u'CFBundleTypeRole': u'Viewer',
                 u'LSItemContentTypes': [u'org.khronos.collada.digital-asset-exchange'],
-                u'LSHandlerRank': u'Alternate'
+                u'LSHandlerRank': u'Owner'
             },
             {
                 u'CFBundleTypeName': u'Wavefront 3D Object',
                 u'CFBundleTypeExtensions': [u'obj'],
                 u'CFBundleTypeMIMETypes': [u'application/obj-3d'],
                 u'CFBundleTypeRole': u'Viewer',
-                u'LSHandlerRank': u'Alternate'
+                u'LSHandlerRank': u'Owner'
             }
         ],
         u'UTImportedTypeDeclarations': [