diff --git a/.gitignore b/.gitignore
index 26c2e2c..ee88459 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ __pycache__
 /cocoa/*.lproj/*.strings
 !/cocoa/Base.lproj/Localizable.strings
 
+.vscode
+
 # Xcode
 *.xcworkspace
 !default.xcworkspace
diff --git a/.gitmodules b/.gitmodules
index 7acda0c..dd9c515 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "dupeguru"]
 	path = dupeguru
 	url = https://github.com/hsoft/dupeguru.git
-[submodule "hscommon"]
-	path = hscommon
-	url = https://github.com/hsoft/hscommon.git
diff --git a/build.py b/build.py
index 76b59c9..913ddbc 100644
--- a/build.py
+++ b/build.py
@@ -90,7 +90,7 @@ def build_cocoa(dev):
         os.mkdir(pydep_folder)
     shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
     tocopy = [
-        'dupeguru/core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag',
+        'dupeguru/core', 'dupeguru/hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag',
     ]
     copy_packages(tocopy, pydep_folder, create_links=dev)
     sys.path.insert(0, 'build')
diff --git a/cocoalib/HSErrorReportWindow.m b/cocoalib/HSErrorReportWindow.m
index bbe5280..268425b 100644
--- a/cocoalib/HSErrorReportWindow.m
+++ b/cocoalib/HSErrorReportWindow.m
@@ -38,6 +38,6 @@ http://www.gnu.org/licenses/gpl-3.0.html
 - (IBAction)close:(id)sender
 {
     [[self window] orderOut:self];
-    [NSApp stopModalWithCode:NSOKButton];
+    [NSApp stopModalWithCode:NSModalResponseOK];
 }
 @end
\ No newline at end of file
diff --git a/hscommon b/hscommon
deleted file mode 160000
index a56aee2..0000000
--- a/hscommon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a56aee2f08becba9b968ff96caa3a7f6651a4c74
diff --git a/package.py b/package.py
index d730b2a..5efb8ba 100644
--- a/package.py
+++ b/package.py
@@ -6,6 +6,11 @@
 
 from argparse import ArgumentParser
 
+# Modify the python path so the hscommon files in the dupeguru submodule may be used
+import sys
+import os
+sys.path.append(os.path.join(os.getcwd(), 'dupeguru'))
+
 from hscommon.build import setup_package_argparser, package_cocoa_app_in_dmg
 
 def parse_args():
@@ -14,7 +19,7 @@ def parse_args():
     return parser.parse_args()
 
 def package_cocoa(args):
-    app_path = 'build/dupeGuru.app'
+    app_path = 'build/Release/dupeGuru.app'
     package_cocoa_app_in_dmg(app_path, '.', args)
 
 def main():