diff --git a/drivers/floppy.asm b/drivers/floppy.asm
index 3ce1037..9929c5e 100644
--- a/drivers/floppy.asm
+++ b/drivers/floppy.asm
@@ -30,7 +30,7 @@
 
 %ifndef SYS
      %include "..\kernel\segs.inc"
-     segment _TEXT
+     segment HMA_TEXT
 %else
      segment _TEXT class=CODE
 %endif
diff --git a/drivers/getvec.asm b/drivers/getvec.asm
index 0acd3f7..153b20a 100644
--- a/drivers/getvec.asm
+++ b/drivers/getvec.asm
@@ -30,7 +30,7 @@
 
                 %include "..\kernel\segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
 
 		global	_getvec
 _getvec:
diff --git a/drivers/rdatclk.asm b/drivers/rdatclk.asm
index 81c026f..8abd5b7 100644
--- a/drivers/rdatclk.asm
+++ b/drivers/rdatclk.asm
@@ -32,7 +32,7 @@
 
         %include "..\kernel\segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
 
 ;
 ;COUNT ReadATClock(bcdDays, bcdHours, bcdMinutes, bcdSeconds)
diff --git a/drivers/rdpcclk.asm b/drivers/rdpcclk.asm
index e202bec..81ed79e 100644
--- a/drivers/rdpcclk.asm
+++ b/drivers/rdpcclk.asm
@@ -30,7 +30,7 @@
 
         %include "..\kernel\segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
 
 ;
 ;       BOOL ReadPCClock(Ticks)
diff --git a/drivers/wratclk.asm b/drivers/wratclk.asm
index d539e7e..ab9071b 100644
--- a/drivers/wratclk.asm
+++ b/drivers/wratclk.asm
@@ -30,7 +30,7 @@
 
                 %include "..\kernel\segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
 
 ;
 ;       VOID WriteATClock(bcdDays, bcdHours, bcdMinutes, bcdSeconds)
diff --git a/drivers/wrpcclk.asm b/drivers/wrpcclk.asm
index c7ba246..7e6f735 100644
--- a/drivers/wrpcclk.asm
+++ b/drivers/wrpcclk.asm
@@ -29,7 +29,7 @@
 ;
         %include "..\kernel\segs.inc"
 
-segment _TEXT
+segment HMA_TEXT
 
 
 ;
diff --git a/kernel/apisupt.asm b/kernel/apisupt.asm
index 8d5271b..914fd6c 100644
--- a/kernel/apisupt.asm
+++ b/kernel/apisupt.asm
@@ -29,7 +29,7 @@
 
 		%include "segs.inc"
 
-segment _TEXT
+segment HMA_TEXT
 %if 0
 
                 extern  _api_sp:wrt DGROUP      ; api stacks - for context
diff --git a/kernel/asmsupt.asm b/kernel/asmsupt.asm
index 4986c32..55525ad 100644
--- a/kernel/asmsupt.asm
+++ b/kernel/asmsupt.asm
@@ -36,7 +36,7 @@
 
 		%include "segs.inc"
 
-segment _TEXT
+segment HMA_TEXT
 
 ;*********************************************************************
 ; this implements some of the common string handling functions
diff --git a/kernel/dosidle.asm b/kernel/dosidle.asm
index 9bdcd70..e0e4cab 100644
--- a/kernel/dosidle.asm
+++ b/kernel/dosidle.asm
@@ -31,7 +31,7 @@
 PSP_USERSP      equ     2eh
 PSP_USERSS      equ     30h
 
-segment _TEXT
+segment HMA_TEXT
 
                 global  _DosIdle_int
 
diff --git a/kernel/entry.asm b/kernel/entry.asm
index 1a48716..45b353f 100644
--- a/kernel/entry.asm
+++ b/kernel/entry.asm
@@ -31,7 +31,7 @@
 		%include "segs.inc"
                 %include "stacks.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
                 extern   _int21_syscall:wrt TGROUP
                 extern   _int21_service:wrt TGROUP
                 extern   _int2526_handler:wrt TGROUP
diff --git a/kernel/execrh.asm b/kernel/execrh.asm
index 1bb8545..9174082 100644
--- a/kernel/execrh.asm
+++ b/kernel/execrh.asm
@@ -30,7 +30,7 @@
 
                 %include "segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
                 ; _execrh
                 ;       Execute Device Request
                 ;
diff --git a/kernel/int2f.asm b/kernel/int2f.asm
index 27fd82a..7d1c152 100644
--- a/kernel/int2f.asm
+++ b/kernel/int2f.asm
@@ -31,9 +31,9 @@
 		%include "segs.inc"
         %include "stacks.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
             extern  _cu_psp:wrt DGROUP
-            extern _syscall_MUX14:wrt _TEXT
+            extern _syscall_MUX14:wrt HMA_TEXT
 
                 global  reloc_call_int2f_handler
 reloc_call_int2f_handler:
diff --git a/kernel/intr.asm b/kernel/intr.asm
index 88f716e..eebbfb0 100644
--- a/kernel/intr.asm
+++ b/kernel/intr.asm
@@ -28,7 +28,7 @@
 
 		%include "segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
 ;
 ;       void intr(nr, rp)
 ;       REG int nr
diff --git a/kernel/kernel.asm b/kernel/kernel.asm
index d40073c..1dbe428 100644
--- a/kernel/kernel.asm
+++ b/kernel/kernel.asm
@@ -704,7 +704,7 @@ __HMATextStart:
 ; the HMA area is filled with 1eh+3(=sizeof VDISK) = 33 byte dummy data,
 ; so nothing will ever be below 0xffff:0031
 ;
-segment _TEXT
+segment HMA_TEXT
 begin_hma:              
                 times 10h db 0   ; filler [ffff:0..ffff:10]
                 times 20h db 0
diff --git a/kernel/nlssupt.asm b/kernel/nlssupt.asm
index 284bbe9..d41d257 100644
--- a/kernel/nlssupt.asm
+++ b/kernel/nlssupt.asm
@@ -30,7 +30,7 @@
 
 		%include "segs.inc"
 
-segment	_TEXT
+segment	HMA_TEXT
                 global  _reloc_call_CharMapSrvc
                 extern  _DosUpChar:wrt TGROUP
 ;
diff --git a/kernel/procsupt.asm b/kernel/procsupt.asm
index 00a77bf..fc02bb9 100644
--- a/kernel/procsupt.asm
+++ b/kernel/procsupt.asm
@@ -38,7 +38,7 @@
 
                 %include "stacks.inc"
 
-segment _TEXT
+segment HMA_TEXT
 
                 extern   _DGROUP_:wrt LGROUP
 
@@ -85,7 +85,7 @@ _got_cbreak:
 	pop ds
 	iret
 
-segment	_TEXT
+segment	HMA_TEXT
 
 ;
 ;       Special call for switching processes during break handling
diff --git a/kernel/segs.inc b/kernel/segs.inc
index 6646a18..1ec3eb3 100644
--- a/kernel/segs.inc
+++ b/kernel/segs.inc
@@ -31,7 +31,7 @@ group   PGROUP          PSP
 group   LGROUP          _LOWTEXT _IO_TEXT _IO_FIXED_DATA
 group   DGROUP          _FIXED_DATA _BSS _DATA _DATAEND CONST CONST2 DCONST DYN_DATA
 group   I_GROUP         INIT_TEXT_START INIT_TEXT INIT_TEXT_END ID_B ID ID_E IC IDATA ICONST ICONST2 I_DATA IB_B I_BSS IB IB_E
-group   TGROUP          HMA_TEXT_START _TEXT HMA_TEXT_END
+group   TGROUP          HMA_TEXT_START HMA_TEXT HMA_TEXT_END
 
 segment PSP             class=PSP
 segment	_LOWTEXT	class=LCODE
@@ -48,7 +48,7 @@ segment CONST2		class=DATA align=2
 segment	DCONST      	class=DCONST   align=2     
 segment	DYN_DATA        class=DYN_DATA
 segment	HMA_TEXT_START	class=CODE align=16
-segment	_TEXT		class=CODE
+segment	HMA_TEXT	class=CODE
 segment HMA_TEXT_END	class=CODE
 segment INIT_TEXT_START class=INIT align=16
 segment	INIT_TEXT	class=INIT
diff --git a/mkfiles/bc5.mak b/mkfiles/bc5.mak
index 8f448e6..60831f8 100644
--- a/mkfiles/bc5.mak
+++ b/mkfiles/bc5.mak
@@ -23,8 +23,8 @@ TARGET=KBC
 # used for building the library
 
 CLIB=$(COMPILERPATH)\lib\cs.lib
-MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *N_LXMUL *F_LXMUL *H_LRSH
-MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +N_LXMUL +F_LXMUL +H_LRSH
+MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *F_LXMUL
+MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL
 
 #
 # heavy stuff - building the kernel
@@ -48,6 +48,6 @@ MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +N_LXMUL +F_LXMUL +H_LRSH
 #
 # ALLCFLAGS specified by turbo.cfg and config.mak
 #
-ALLCFLAGS=$(TARGETOPT) $(ALLCFLAGS)
+ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
 INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
 CFLAGS=$(ALLCFLAGS)
diff --git a/mkfiles/tc2.mak b/mkfiles/tc2.mak
index b527c08..d9fd557 100644
--- a/mkfiles/tc2.mak
+++ b/mkfiles/tc2.mak
@@ -48,6 +48,6 @@ MATH_INSERT=+LDIV +LXMUL  +LURSH +LLSH +LRSH
 #
 # ALLCFLAGS specified by turbo.cfg and config.mak
 #
-ALLCFLAGS=$(TARGETOPT) $(ALLCFLAGS)
+ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
 INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
 CFLAGS=$(ALLCFLAGS)
diff --git a/mkfiles/tc3.mak b/mkfiles/tc3.mak
index 3761f89..57b3cc8 100644
--- a/mkfiles/tc3.mak
+++ b/mkfiles/tc3.mak
@@ -23,8 +23,8 @@ TARGET=KT3
 # used for building the library
 
 CLIB=$(COMPILERPATH)\lib\cs.lib
-MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *N_LXMUL *F_LXMUL *H_LRSH
-MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +N_LXMUL +F_LXMUL +H_LRSH
+MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *F_LXMUL
+MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL
 
 #
 # heavy stuff - building the kernel
@@ -48,6 +48,6 @@ MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +N_LXMUL +F_LXMUL +H_LRSH
 #
 # ALLCFLAGS specified by turbo.cfg and config.mak
 #
-ALLCFLAGS=$(TARGETOPT) $(ALLCFLAGS)
+ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
 INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
 CFLAGS=$(ALLCFLAGS)
diff --git a/mkfiles/turbocpp.mak b/mkfiles/turbocpp.mak
index 1122f2d..d171682 100644
--- a/mkfiles/turbocpp.mak
+++ b/mkfiles/turbocpp.mak
@@ -23,8 +23,8 @@ TARGET=KTP
 # used for building the library
 
 CLIB=$(COMPILERPATH)\lib\cs.lib
-MATH_EXTRACT=*H_LDIV *F_LXMUL *H_LURSH *H_LLSH *H_LRSH
-MATH_INSERT=+H_LDIV +F_LXMUL +H_LURSH +H_LLSH +H_LRSH
+MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *F_LXMUL
+MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL
 
 #
 # heavy stuff - building the kernel
@@ -48,6 +48,6 @@ MATH_INSERT=+H_LDIV +F_LXMUL +H_LURSH +H_LLSH +H_LRSH
 #
 # ALLCFLAGS specified by turbo.cfg and config.mak
 #
-ALLCFLAGS=$(TARGETOPT) $(ALLCFLAGS)
+ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
 INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
 CFLAGS=$(ALLCFLAGS)
diff --git a/mkfiles/watcom.mak b/mkfiles/watcom.mak
index d4e5ed5..10f1884 100644
--- a/mkfiles/watcom.mak
+++ b/mkfiles/watcom.mak
@@ -63,6 +63,6 @@ MATH_INSERT= +i4d +i4m
 
 ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS)-zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff
 INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-ncINIT-ndI-gI_GROUP
-CFLAGS=$(ALLCFLAGS)
+CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT
 INITPATCH=..\utils\patchobj __U4D=_IU4D __U4M=_IU4M