diff --git a/PTerm-Core/PTerm.class.st b/PTerm-Core/PTerm.class.st
index e05a81f..c2b59f3 100644
--- a/PTerm-Core/PTerm.class.st
+++ b/PTerm-Core/PTerm.class.st
@@ -101,7 +101,7 @@ PTerm >> pid [
 PTerm >> run [
 	sub := self announcer when: PTermDataEvent  do: [ :e|
 		e data do:[:c|
-			up upcall: c codePoint ]].
+			up upcall: c codePoint ]] for: self.
 	[ self waitForOutput ] forkAt: Processor userSchedulingPriority
 
 ]
@@ -120,7 +120,7 @@ PTerm >> setWinsize: point [
 	buf at: 6 put: 0.
 	buf at: 7 put: 0.
 	buf at: 8 put:0.
-	st := self lib ioct: self master cmd: self lib class TIOCSWINSZ  arg: buf getHandle.
+	st := self lib ioct: master cmd: self lib class TIOCSWINSZ  arg: buf getHandle.
 	st = 0 ifFalse:[^self error: 'Cannot set window size to', point asString ]
 ]
 
diff --git a/PTerm-UI/TerminalEmulator.class.st b/PTerm-UI/TerminalEmulator.class.st
index 25efa62..5e84a22 100644
--- a/PTerm-UI/TerminalEmulator.class.st
+++ b/PTerm-UI/TerminalEmulator.class.st
@@ -133,7 +133,7 @@ TerminalEmulator class >> initialize [
 			e data class = LogicalFont ifTrue:[i updateFont]
 			ifFalse:[i updateTheme]
 		]
-	].
+	] for: self.
 ]
 
 { #category : #'world menu' }
diff --git a/PTerm-UI/TerminalEmulatorLineMorph.class.st b/PTerm-UI/TerminalEmulatorLineMorph.class.st
index 1e12a93..4c86ea0 100644
--- a/PTerm-UI/TerminalEmulatorLineMorph.class.st
+++ b/PTerm-UI/TerminalEmulatorLineMorph.class.st
@@ -4713,7 +4713,7 @@ TerminalEmulatorLineMorph >> initialize [
 	"Initialize the receiver with empty contents."
 
 	self contents: TerminalEmulatorTextState new.
-	self announcer when: TerminalEmulatorConfigChange  do: [ :e| self setUpFont. Transcript show: 'font changed']. 
+	self announcer when: TerminalEmulatorConfigChange  do: [ :e| self setUpFont. Transcript show: 'font changed'] for: self. 
 	"self on: Character null ctrl  do: [ :e| Transcript show: 'stroke';cr ]"
 	"cursorColour := Color red."
 ]
diff --git a/PTerm-UI/TerminalEmulatorMorph.class.st b/PTerm-UI/TerminalEmulatorMorph.class.st
index 925e96f..3914bb3 100644
--- a/PTerm-UI/TerminalEmulatorMorph.class.st
+++ b/PTerm-UI/TerminalEmulatorMorph.class.st
@@ -1725,7 +1725,7 @@ TerminalEmulatorMorph >> showScrollbar [
 
 	scroll isNil
 		ifTrue:
-			[scroll := ScrollBar new model: self;
+			[scroll := (Smalltalk globals at: #ScrollBar ifAbsent: [ ^ScrollBarMorph ]) new model: self;
 			setValueSelector: #scrollbarValue:.
 			 self
 				addMorphBack: scroll;