diff --git a/installer.nsi b/installer.nsi
index d208df90..e03eaf86 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -54,10 +54,10 @@ Section "VCV Rack" VCV_RACK_SECTION
 
 	; Write uninstaller info
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "DisplayName" "VCV Rack"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "DisplayIcon" "$\"$INSTDIR\Rack.exe$\""
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" \S"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "InstallLocation" "$\"$INSTDIR$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "DisplayIcon" '"$INSTDIR\Rack.exe"'
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "QuietUninstallString" '"$INSTDIR\Uninstall.exe" /S'
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "InstallLocation" '"$INSTDIR"'
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "Publisher" "VCV"
 	SectionGetSize ${VCV_RACK_SECTION} $0
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack" "EstimatedSize" $0
@@ -65,6 +65,11 @@ Section "VCV Rack" VCV_RACK_SECTION
 	; Create uninstaller
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
+	; Associate file type
+	WriteRegStr HKLM "Software\Classes\.vcv" "" "VCVRack.Patch"
+	WriteRegStr HKLM "Software\Classes\VCVRack.Patch" "" "VCV Rack Patch"
+	WriteRegStr HKLM "Software\Classes\VCVRack.Patch\shell\open\command" "" '"$INSTDIR\Rack.exe" "%1"'
+
 	; Create shortcuts
 	CreateDirectory "$SMPROGRAMS"
 	CreateShortcut "$SMPROGRAMS\VCV Rack.lnk" "$INSTDIR\Rack.exe"
@@ -83,6 +88,8 @@ Section "Uninstall"
 	DeleteRegKey HKLM "Software\VCV\Rack"
 	DeleteRegKey /ifempty HKLM "Software\VCV"
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCV Rack"
+	DeleteRegKey HKLM "Software\Classes\.vcv"
+	DeleteRegKey HKLM "Software\Classes\VCVRack.Patch"
 SectionEnd
 
 
diff --git a/src/main.cpp b/src/main.cpp
index f01d6758..eafa6a4a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
 
 	// We can now install a signal handler and log the output
 	// Mac has its own decent crash handler
-#if defined ARCH_LIN || defined ARCH_WIN
+#if 0
 	if (!devMode) {
 		signal(SIGABRT, fatalSignalHandler);
 		signal(SIGFPE, fatalSignalHandler);