diff --git a/asminc/em-kernel.inc b/asminc/em-kernel.inc
index 313bfc0bf..e7cdf9a70 100644
--- a/asminc/em-kernel.inc
+++ b/asminc/em-kernel.inc
@@ -55,7 +55,7 @@
 ;------------------------------------------------------------------------------
 ; The EMD API version, stored in EMD_HDR::VERSION
 
-EMD_API_VERSION         = $01
+EMD_API_VERSION         = $02
 
 ;------------------------------------------------------------------------------
 ; The asm equivalent to the C em_copy structure
diff --git a/asminc/joy-kernel.inc b/asminc/joy-kernel.inc
index da22662b5..4fe5572cf 100644
--- a/asminc/joy-kernel.inc
+++ b/asminc/joy-kernel.inc
@@ -56,7 +56,7 @@
 ;------------------------------------------------------------------------------
 ; The JOY API version, stored in JOY_HDR::VERSION
 
-JOY_API_VERSION         = $02
+JOY_API_VERSION         = $03
 
 ;------------------------------------------------------------------------------
 ; Variables
diff --git a/asminc/mouse-kernel.inc b/asminc/mouse-kernel.inc
index 9db47fcb8..d3ec9b30f 100644
--- a/asminc/mouse-kernel.inc
+++ b/asminc/mouse-kernel.inc
@@ -97,7 +97,7 @@
 ;------------------------------------------------------------------------------
 ; The mouse API version, stored in MOUSE_HDR::VERSION
 
-MOUSE_API_VERSION       = $03
+MOUSE_API_VERSION       = $04
 
 ;------------------------------------------------------------------------------
 ; Bitmapped mouse driver flags, stored in MOUSE_HDR::FLAGS.
diff --git a/asminc/ser-kernel.inc b/asminc/ser-kernel.inc
index fff9b1440..e59501da6 100644
--- a/asminc/ser-kernel.inc
+++ b/asminc/ser-kernel.inc
@@ -57,7 +57,7 @@
 ;------------------------------------------------------------------------------
 ; The SER API version, stored SER_HDR::VERSION
 
-SER_API_VERSION         = $01
+SER_API_VERSION         = $02
 
 ;------------------------------------------------------------------------------
 ; ser_params
diff --git a/asminc/tgi-kernel.inc b/asminc/tgi-kernel.inc
index 6e687315d..e9f2f6aa9 100644
--- a/asminc/tgi-kernel.inc
+++ b/asminc/tgi-kernel.inc
@@ -77,7 +77,7 @@
 ;------------------------------------------------------------------------------
 ; The TGI API version, stored at TGI_HDR_VERSION
 
-TGI_API_VERSION         = $04
+TGI_API_VERSION         = $05
 
 ;------------------------------------------------------------------------------
 ; Bitmapped tgi driver flags, stored in TGI_HDR::VARS::FLAGS.
diff --git a/libsrc/common/strlower.s b/libsrc/common/strlower.s
index 9df79b732..848a4faff 100644
--- a/libsrc/common/strlower.s
+++ b/libsrc/common/strlower.s
@@ -1,8 +1,9 @@
 ;
-; Ullrich von Bassewitz, 02.06.1998
+; 1998-06-02, Ullrich von Bassewitz
+; 2013-08-28, Greg King
 ;
-; char* strlower (char* s);
-; char* strlwr (char* s);
+; char* __fastcall__ strlower (char* s);
+; char* __fastcall__ strlwr (char* s);
 ;
 ; Non-ANSI
 ;
@@ -19,7 +20,7 @@ _strlwr:
         sta     ptr1            ; Save s (working copy)
         stx     ptr1+1
         sta     ptr2
-        sta     ptr2+1          ; save function result
+        stx     ptr2+1          ; save function result
         ldy     #0
 
 loop:   lda     (ptr1),y        ; get character
diff --git a/libsrc/common/strupper.s b/libsrc/common/strupper.s
index d7aa2f914..bf0d3b622 100644
--- a/libsrc/common/strupper.s
+++ b/libsrc/common/strupper.s
@@ -1,8 +1,9 @@
 ;
-; Ullrich von Bassewitz, 02.06.1998
+; 1998-06-02, Ullrich von Bassewitz
+; 2013-08-28, Greg King
 ;
-; char* strupper (char* s);
-; char* strupr (char* s);
+; char* __fastcall__ strupper (char* s);
+; char* __fastcall__ strupr (char* s);
 ;
 ; Non-ANSI
 ;
@@ -19,7 +20,7 @@ _strupr:
         sta     ptr1            ; Save s (working copy)
         stx     ptr1+1
         sta     ptr2
-        sta     ptr2+1          ; save function result
+        stx     ptr2+1          ; save function result
         ldy     #0
 
 loop:   lda     (ptr1),y        ; get character