diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index 4e20b7f37a5..fe28564bf98 100644
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -30,7 +30,7 @@ def main():
 		dummy = Res.GetResource('DLOG', ID_MAIN)
 	except Res.Error:
 		try:
-			Res.OpenResFile("PICTbrowse.rsrc")
+			Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
 		except Res.Error, arg:
 			EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
 			sys.exit(1)	
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index 653dd5d12d5..07719918f7e 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -25,7 +25,7 @@ def main():
 		dummy = Res.GetResource('DLOG', ID_MAIN)
 	except Res.Error:
 		try:
-			Res.OpenResFile("PICTbrowse.rsrc")
+			Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
 		except Res.Error, arg:
 			EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
 			sys.exit(1)	
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.rsrc b/Mac/Demo/PICTbrowse/PICTbrowse.rsrc
index aae379bf09f..526ff522aa7 100644
Binary files a/Mac/Demo/PICTbrowse/PICTbrowse.rsrc and b/Mac/Demo/PICTbrowse/PICTbrowse.rsrc differ
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index 31169eea54b..c78960cc29b 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -29,7 +29,7 @@ def main():
 		dummy = Res.GetResource('DLOG', ID_MAIN)
 	except Res.Error:
 		try:
-			Res.OpenResFile("PICTbrowse.rsrc")
+			Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
 		except Res.Error, arg:
 			EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
 			sys.exit(1)	
diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index 67ec355fc15..b56cd134298 100644
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -30,7 +30,7 @@ def main():
 		dummy = Res.GetResource('DLOG', ID_MAIN)
 	except Res.Error:
 		try:
-			Res.OpenResFile("PICTbrowse.rsrc")
+			Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
 		except Res.Error, arg:
 			EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
 			sys.exit(1)	
diff --git a/Mac/Demo/PICTbrowse/oldPICTbrowse.rsrc b/Mac/Demo/PICTbrowse/oldPICTbrowse.rsrc
index 6745d2f4631..fb7a192df2c 100644
Binary files a/Mac/Demo/PICTbrowse/oldPICTbrowse.rsrc and b/Mac/Demo/PICTbrowse/oldPICTbrowse.rsrc differ
diff --git a/Mac/Demo/cgi/realcgitest.py b/Mac/Demo/cgi/realcgitest.py
index a91771a83f1..e51cb978207 100644
--- a/Mac/Demo/cgi/realcgitest.py
+++ b/Mac/Demo/cgi/realcgitest.py
@@ -4,6 +4,8 @@
 from MiniAEFrame import AEServer, MiniApplication
 import MacOS
 
+debug=1
+
 class CGITest(AEServer, MiniApplication):
 	
 	def __init__(self):
@@ -12,6 +14,8 @@ class CGITest(AEServer, MiniApplication):
 		self.installaehandler('aevt', 'oapp', self.open_app)
 		self.installaehandler('aevt', 'quit', self.quit)
 		self.installaehandler('WWW\275', 'sdoc', self.cgihandler)
+		if debug:
+			self.installaehandler('****', '****', self.otherhandler)
 		oldparams = MacOS.SchedParams(0, 0)
 		self.mainloop()
 		apply(MacOS.SchedParams, oldparams)
@@ -21,8 +25,15 @@ class CGITest(AEServer, MiniApplication):
 		
 	def open_app(self, **args):
 		pass
-				
+	
+	def otherhandler(self, *args, **kwargs):
+		print 'Unknown AppleEvent'
+		print 'args', args
+		print 'kwargs', kwargs
+		
 	def cgihandler(self, pathargs, **args):
+		if debug:
+			print 'CGI request', pathargs, args
 		rv = """HTTP/1.0 200 OK
 Server: Unknown; python-cgi-script
 MIME-Version: 1.0
diff --git a/Mac/Demo/example1/dnslookup-1.py b/Mac/Demo/example1/dnslookup-1.py
index a59fb8ee990..294faad3630 100644
--- a/Mac/Demo/example1/dnslookup-1.py
+++ b/Mac/Demo/example1/dnslookup-1.py
@@ -20,7 +20,7 @@ ITEM_QUIT_BUTTON=4
 def main():
     """Main routine: open resource file, call dialog handler"""
     try:
-        Res.OpenResFile("dnslookup-1.rsrc")
+        Res.FSpOpenResFile("dnslookup-1.rsrc", 1)
     except Res.Error:
         EasyDialogs.Message("Cannot open dnslookup-1.rsrc")
         sys.exit(1) 
diff --git a/Mac/Demo/example1/dnslookup-1.rsrc b/Mac/Demo/example1/dnslookup-1.rsrc
index 2514f5604fe..6cf9fe98884 100644
Binary files a/Mac/Demo/example1/dnslookup-1.rsrc and b/Mac/Demo/example1/dnslookup-1.rsrc differ
diff --git a/Mac/Demo/example2/dnslookup-2.py b/Mac/Demo/example2/dnslookup-2.py
index 970b2abcdd6..82568d0ca80 100644
--- a/Mac/Demo/example2/dnslookup-2.py
+++ b/Mac/Demo/example2/dnslookup-2.py
@@ -19,7 +19,7 @@ def main():
         dummy = Res.GetResource('DLOG', ID_MAIN)
     except Res.Error:
         try:
-            Res.OpenResFile("dnslookup-2.rsrc")
+            Res.FSpOpenResFile("dnslookup-2.rsrc", 1)
         except Res.Error:
             EasyDialogs.Message("Cannot open dnslookup-2.rsrc")
             sys.exit(1) 
diff --git a/Mac/Demo/example2/dnslookup-2.rsrc b/Mac/Demo/example2/dnslookup-2.rsrc
index 5276ee2f93d..17b22d94c57 100644
Binary files a/Mac/Demo/example2/dnslookup-2.rsrc and b/Mac/Demo/example2/dnslookup-2.rsrc differ
diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index 5aa02072672..c6ae2e73a2c 100644
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -72,7 +72,7 @@ class WasteWindow(ScrolledWindow):
 			return None, None
 		oldrf = Res.CurResFile()
 		try:
-			rf = Res.OpenResFile(self.path)
+			rf = Res.FSpOpenResFile(self.path, 1)
 		except Res.Error:
 			return None, None
 		try:
@@ -241,10 +241,10 @@ class WasteWindow(ScrolledWindow):
 		#
 		oldresfile = Res.CurResFile()
 		try:
-			rf = Res.OpenResFile(self.path)
+			rf = Res.FSpOpenResFile(self.path, 3)
 		except Res.Error:
 			Res.CreateResFile(self.path)
-			rf = Res.OpenResFile(self.path)
+			rf = Res.FSpOpenResFile(self.path, 3)
 		styles = Res.Resource('')
 		soup = Res.Resource('')
 		self.ted.WECopyRange(0, 0x3fffffff, None, styles, soup)
diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index 83f29b7f9d7..473d777bc17 100644
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -59,7 +59,7 @@ class WasteWindow(ScrolledWindow):
 			return None, None
 		oldrf = Res.CurResFile()
 		try:
-			rf = Res.OpenResFile(self.path)
+			rf = Res.FSpOpenResFile(self.path, 1)
 		except Res.Error:
 			return None, None
 		try:
@@ -210,10 +210,10 @@ class WasteWindow(ScrolledWindow):
 		#
 		oldresfile = Res.CurResFile()
 		try:
-			rf = Res.OpenResFile(self.path)
+			rf = Res.FSpOpenResFile(self.path, 3)
 		except Res.Error:
 			Res.CreateResFile(self.path)
-			rf = Res.OpenResFile(self.path)
+			rf = Res.FSpOpenResFile(self.path, 3)
 		styles = Res.Resource('')
 		soup = Res.Resource('')
 		self.ted.WECopyRange(0, 0x3fffffff, None, styles, soup)