diff --git a/include/telestrat.h b/include/telestrat.h
index 5ad1d3bef..465517f30 100644
--- a/include/telestrat.h
+++ b/include/telestrat.h
@@ -121,3 +121,9 @@ void shoot();
 void explode();
 
 void kbdclick1();
+
+/* The following #defines will cause the matching functions calls in conio.h
+** to be overlaid by macros with the same names, saving the function call
+** overhead.
+*/
+#define _bordercolor(color)     COLOR_BLACK
diff --git a/libsrc/telestrat/bordercolor.s b/libsrc/telestrat/bordercolor.s
index 9e49b057f..84e167bc9 100644
--- a/libsrc/telestrat/bordercolor.s
+++ b/libsrc/telestrat/bordercolor.s
@@ -9,8 +9,5 @@
 
         .include        "telestrat.inc"
 
-_bordercolor:
-        ; Nothing to do
-        ; Oric can't handle his border
-        rts
+_bordercolor    := return0
 
diff --git a/libsrc/telestrat/clrscr.s b/libsrc/telestrat/clrscr.s
index 363aa2761..c02c26647 100644
--- a/libsrc/telestrat/clrscr.s
+++ b/libsrc/telestrat/clrscr.s
@@ -23,9 +23,9 @@
 
 
     ; reset prompt position
-    lda     #<(SCREEN)
+    lda     #<SCREEN
     sta     ADSCR
-    lda     #>(SCREEN)
+    lda     #>SCREEN
     sta     ADSCR+1
 
     lda     #$00
@@ -36,10 +36,10 @@
     stx     SCRY
     stx     SCRX
     
-    stx     OLD_BGCOLOR     ; black
+    stx     OLD_BGCOLOR                             ; Black
     stx     BGCOLOR
     
-    ldx     #$07            ; white
+    ldx     #$07                                    ; White
     stx     OLD_CHARCOLOR
     stx     CHARCOLOR
     
diff --git a/libsrc/telestrat/cputc.s b/libsrc/telestrat/cputc.s
index aa756aaf5..994a2b9d4 100644
--- a/libsrc/telestrat/cputc.s
+++ b/libsrc/telestrat/cputc.s
@@ -4,7 +4,8 @@
 ; void cputc (char c);
 ;
 
-        .export         _cputc, _cputcxy, cputdirect, display_conio, CHARCOLOR, OLD_CHARCOLOR, BGCOLOR, OLD_BGCOLOR
+        .export         _cputc, _cputcxy, cputdirect, display_conio
+        .export         CHARCOLOR, OLD_CHARCOLOR, BGCOLOR, OLD_BGCOLOR
 
         
         .import         update_adscr
@@ -14,10 +15,10 @@
 
 cputdirect:
 _cputcxy:
-    pha                     ; Save C
-    jsr     popax           ; Get X and Y
-    sta     SCRY            ; Store Y
-    stx     SCRX            ; Store X
+    pha                           ; Save C
+    jsr     popax                 ; Get X and Y
+    sta     SCRY                  ; Store Y
+    stx     SCRX                  ; Store X
     jsr     update_adscr
     pla        
 
@@ -34,9 +35,7 @@ _cputcxy:
     inc     SCRY
     jmp     update_adscr
 
-
 @not_LF:
-
     ldx     CHARCOLOR
     cpx     OLD_CHARCOLOR
     beq     do_not_change_color_foreground
@@ -87,8 +86,6 @@ do_not_change_color:
     rts
 .endproc
 
-
-
 .bss
 CHARCOLOR:
     .res 1