diff --git a/patchset/Cube-E/2-build-system.patch b/patchset/Cube-E/2-build-system.patch
index e04adac..04305e2 100644
--- a/patchset/Cube-E/2-build-system.patch
+++ b/patchset/Cube-E/2-build-system.patch
@@ -228,7 +228,7 @@ new file mode 100644
 +					"{RsrcDir}SoundPFDProc.rsrc"			∂
 +					"{RsrcDir}SoundInputProc.rsrc"			∂
 +					"{RsrcDir}SnthLoading.rsrc"				∂
-+#					"{RsrcDir}StandardNBP.p.rsrc"			∂
++					"{RsrcDir}StandardNBP.p.rsrc"			∂
 +					"{RsrcDir}StandardWDEF.a.rsrc"			∂
 +					"{RsrcDir}StandardFile.rsrc"			∂
 +					"{RsrcDir}TFBDriver.a.rsrc"				∂
@@ -763,7 +763,7 @@ new file mode 100644
 +											"{IntRIncludes}CommToolboxPriv.r"
 +	Rez {StdROpts} -o {Targ} "{CommChooseDir}Choose.r"
 +"{RsrcDir}StandardNBP.p.rsrc"			ƒ	{StandardNBPObjs}
-+	Link {StdLOpts} {StdAlign} -rt RSRC=0 -o {Targ} {StandardNBPObjs}
++	Link {StdLOpts} {StdAlign} -rt RSRC=0 -m MAIN -o {Targ} {StandardNBPObjs}
 +"{RsrcDir}StandardNBPHelp.r.rsrc"		ƒ	"{CommNBPDir}StandardNBPHelp.r"			∂
 +											"{RIncludes}BalloonTypes.r"				∂
 +											"{IntRIncludes}CommToolboxPriv.r"
diff --git a/patchset/Cube-E/6-source.patch b/patchset/Cube-E/6-source.patch
index 153342a..2069102 100644
--- a/patchset/Cube-E/6-source.patch
+++ b/patchset/Cube-E/6-source.patch
@@ -6965,27 +6965,6 @@ diff --git a/LinkedPatches/LinkedPatchLoader.a b/LinkedPatches/LinkedPatchLoader
  dsLinkedPatchReferenceTooFar			equ		97					; *** move into SysErr.a
  
  k32BitCQDTrap							equ		$AB03				; trap number for 32-bit QuickDraw
-diff --git a/Make/System.make b/Make/System.make
---- a/Make/System.make
-+++ b/Make/System.make
-@@ -152,7 +152,7 @@ ResourceFiles = ∂
- 					"{RsrcDir}SoundPFDProc.rsrc"			∂
- 					"{RsrcDir}SoundInputProc.rsrc"			∂
- 					"{RsrcDir}SnthLoading.rsrc"				∂
--#					"{RsrcDir}StandardNBP.p.rsrc"			∂
-+					"{RsrcDir}StandardNBP.p.rsrc"			∂
- 					"{RsrcDir}StandardWDEF.a.rsrc"			∂
- 					"{RsrcDir}StandardFile.rsrc"			∂
- 					"{RsrcDir}TFBDriver.a.rsrc"				∂
-@@ -687,7 +687,7 @@ LinkPatchToolObjs = "{Sources}LinkedPatches:LinkPatchLib.o" "{ObjDir}LinkPatch.a
- 											"{IntRIncludes}CommToolboxPriv.r"
- 	Rez {StdROpts} -o {Targ} "{CommChooseDir}Choose.r"
- "{RsrcDir}StandardNBP.p.rsrc"			ƒ	{StandardNBPObjs}
--	Link {StdLOpts} {StdAlign} -rt RSRC=0 -o {Targ} {StandardNBPObjs}
-+	Link {StdLOpts} {StdAlign} -rt RSRC=0 -m MAIN -o {Targ} {StandardNBPObjs}
- "{RsrcDir}StandardNBPHelp.r.rsrc"		ƒ	"{CommNBPDir}StandardNBPHelp.r"			∂
- 											"{RIncludes}BalloonTypes.r"				∂
- 											"{IntRIncludes}CommToolboxPriv.r"
 diff --git a/OS/ADBMgr/ADBMgrPatch.a b/OS/ADBMgr/ADBMgrPatch.a
 --- a/OS/ADBMgr/ADBMgrPatch.a
 +++ b/OS/ADBMgr/ADBMgrPatch.a