diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt
index b4ccf295..6ec8ec55 100644
--- a/SBIN/GETTY.S.txt
+++ b/SBIN/GETTY.S.txt
@@ -15,6 +15,7 @@ TIMEOUT.MAX		.EQ 100					10 sec.
 				.OR ZPBIN
 ZS.START
 ZPPtr1			.BS 2
+TimeOut			.BS 1
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -120,7 +121,8 @@ CS.RUN.LOOP0 	>SLEEP
 				>SYSCALL fwrite
 				bcs CS.RUN.EXIT			I/O error
 
-				jsr Init.Timeout
+				lda #TIMEOUT.MAX
+				sta TimeOut
 			
 CS.RUN.LOOP1	>SLEEP
 
@@ -144,8 +146,8 @@ CS.RUN.LOOP1	>SLEEP
 				
 				bra CS.RUN.LOOP1
 				
-.1				jsr Wait.Timeout
-				bcc CS.RUN.LOOP1
+.1				lda TimeOut
+				bne CS.RUN.LOOP1
 
 				>LDA.G ArgDev
 				>SYSCALL ArgV
@@ -264,11 +266,10 @@ CS.RUN.IAC.SB  	>SYSCALL GetChar		Wait for IAC SB.IS or SEND
 CS.DOEVENT		lda (pEvent)
 				bpl .9					is it a TIMER event?
 
-				>LDA.G TimeOut
+				lda TimeOut
 				beq .9
 				
-				dec 
-				sta (pData),y
+				dec TimeOut
 				
 .9				sec						do not discard TIMER event
 				rts	
@@ -281,16 +282,6 @@ CS.QUIT			>LDA.G hFILE
 .8				clc
 				rts
 *--------------------------------------
-Init.Timeout	lda #TIMEOUT.MAX
-				>STA.G TimeOut
-				rts
-*--------------------------------------
-Wait.TimeOut	sec
-				>LDA.G TimeOut
-				beq .9
-				clc
-.9				rts
-*--------------------------------------
 CkeckOption		lda (ZPPtr1)
 				cmp #'-'
 				bne .8
@@ -351,7 +342,6 @@ ArgDev			.BS 1
 ArgProg			.BS 1
 hFILE			.BS 1
 bExitOnClose	.BS 1
-TimeOut			.BS 1
 IAC.CMD			.BS 1
 IAC.SUBCMD		.BS 1
 IAC.SB.CMD		.BS 1
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index 32655b08..ef5acec2 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -938,14 +938,11 @@ DevMgrInit.SP	ldy #$ff
 .1				jsr $ffff				Self Modified
 				.DA #0					Status
 				.DA SP.IOCTL.STATUS
-				bcs .9
+				bcs DevMgrInit.AddBDev.RTS
 				
 				ldx SP.IOCTL.STATUS.DIB+S.DIB.S
 				
 				>LDYAI DRV.SmartPort
-				jsr DevMgrInit.AddBDev
-				
-.9				rts
 *--------------------------------------
 DevMgrInit.AddBDev
 				>STYA FD.BDEV+S.FD.DEV.DRVPTR
@@ -966,6 +963,7 @@ DevMgrInit.AddBDev
 				>PUSHWI FD.BDEV.NAME
 				>LDYAI FD.BDEV 
 				>SYSCALL MKDev
+DevMgrInit.AddBDev.RTS				
 				rts
 *--------------------------------------
 EvtMgrInit		>LDYAI MSG.EVT