diff --git a/Demo/stdwin/jukebox.py b/Demo/stdwin/jukebox.py
index 377078cfea0..e218e666c72 100755
--- a/Demo/stdwin/jukebox.py
+++ b/Demo/stdwin/jukebox.py
@@ -47,7 +47,7 @@
 
 class struct: pass		# Class to define featureless structures
 
-G = struct()			# oHlds writable global variables
+G = struct()			# Holds writable global variables
 
 
 # Main program
@@ -83,6 +83,10 @@ def main():
 		elif optname == '-t':
 			G.mode = optarg
 	#
+	if G.debug:
+		for name in G.__dict__.keys():
+			print 'G.' + name, '=', `G.__dict__[name]`
+	#
 	if not args:
 		args = [DEF_DB]
 	#
@@ -149,7 +153,7 @@ def killchild():
 		waitchild(0)
 
 def waitchild(options):
-	pid, sts = os.wait(G.busy, options)
+	pid, sts = os.waitpid(G.busy, options)
 	if pid == G.busy:
 		G.busy = 0
 		G.stop.enable(0)