diff --git a/defines.h b/defines.h
index c13c714..3eeb282 100644
--- a/defines.h
+++ b/defines.h
@@ -29,7 +29,6 @@
 #define MSDOS	0
 #define IBMPC	MSDOS
 #define COLOR	MSDOS
-#define MEMMAP	IBMPC
 
 
 #define FILOCK (SVR4 | BSD)
@@ -46,8 +45,8 @@
   void *allocate( size_t size) ;
   void release( void *ptr) ;
 
-# define    malloc  allocate
-# define    free    release
+# define malloc  allocate
+# define free    release
 #endif
 
 /* De-allocate memory always on exit (if the operating system or main
diff --git a/display.c b/display.c
index a8281cd..faf3367 100644
--- a/display.c
+++ b/display.c
@@ -2,6 +2,7 @@
 #include "display.h"
 
 #define	REVSTA	1  /* Status line appears in reverse video         */
+#define MEMMAP	0
 
 /* The functions in this file handle redisplay.  There are two halves, the
    ones that update the virtual display screen, and the ones that make the
@@ -11,6 +12,7 @@
    Modified by Petri Kutvonen
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
@@ -203,8 +205,9 @@ static void sane_vtputc( unicode_t c) {
 
 static void vtputc( unicode_t c) {
 	/* In case somebody passes us a signed char.. */
-	if( c > 0x10FFFF)	/* Let's assume this is due to sign extension */
-		c &= 0xFF ;
+//	if( c > 0x10FFFF)	/* Let's assume this is due to sign extension */
+//		c &= 0xFF ;
+	assert( c <= 0x10FFFF) ;
 
 	if( c == '\t') {
 		sane_vtputc( viewtab ? 0xBB : ' ') ;	/* 0xBB: '»' */