diff --git a/targettest/Makefile b/targettest/Makefile
index 44933949a..f222bb471 100644
--- a/targettest/Makefile
+++ b/targettest/Makefile
@@ -122,6 +122,44 @@ DISK_atarixl   = testcode.atr
 
 .PRECIOUS: %.o
 
+LDFLAGS=
+ifeq ($(SYS),c64)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),c128)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),c16)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),cbm510)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),cbm610)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),cx16)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),geos-cbm)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),lunix)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),pet)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),pet-overlay)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),plus4)
+	LDFLAGS+=-Ln $@.lbl
+endif
+ifeq ($(SYS),vic20)
+	LDFLAGS+=-Ln $@.lbl
+endif
+
 .o:
 ifeq ($(SYS),vic20)
 	$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib
diff --git a/targettest/cbm/Makefile b/targettest/cbm/Makefile
index 298f80d62..a7646c2d9 100644
--- a/targettest/cbm/Makefile
+++ b/targettest/cbm/Makefile
@@ -32,11 +32,19 @@ endif
 
 all: petscii.prg cbmdir-test.prg
 
+ifeq ($(SYS),c64)
 petscii.prg: petscii.c
 	$(CL) -t $(SYS) -O -o petscii.prg petscii.c
+else
+petscii.prg:
+endif
 
 cbmdir-test.prg: cbmdir-test.c
+ifeq ($(SYS),vic20)
+	$(CL) -t $(SYS) -C vic20-32k.cfg -Oris -o $@ $<
+else
 	$(CL) -t $(SYS) -Oris -o $@ $<
+endif
 
 clean:
-	@$(DEL) petscii.prg cbmdir-test.prg 2>$(NULLDEV)
+	@$(DEL) *.lbl petscii.prg cbmdir-test.prg 2>$(NULLDEV)
diff --git a/targettest/gamate/ctest.c b/targettest/gamate/ctest.c
index bff3f5986..9acbe94cd 100644
--- a/targettest/gamate/ctest.c
+++ b/targettest/gamate/ctest.c
@@ -7,7 +7,7 @@ unsigned char y = 0;
 unsigned char x = 0;
 unsigned short n;
 
-int main(int argc, char *argv[])
+void main(void)
 {
     clrscr();
     gotoxy(0,0);cputs("Gamate C-Test");
@@ -47,6 +47,4 @@ int main(int argc, char *argv[])
         (*((unsigned char*)LCD_YPOS)) = y;
 
     }
-
-    return 0;
 }
diff --git a/targettest/heaptest.c b/targettest/heaptest.c
index 560694bee..e3a21eaa6 100644
--- a/targettest/heaptest.c
+++ b/targettest/heaptest.c
@@ -6,7 +6,7 @@
 
 
 
-static unsigned char* V[256];
+static char* V[256];
 
 
 
@@ -17,7 +17,7 @@ static char* Alloc (void)
     unsigned char Size = (((unsigned char)rand()) & 0x7F) + 1;
 
     /* Allocate memory */
-    unsigned char* P = malloc (Size);
+    char* P = malloc (Size);
 
     /* Set the string to a defined value. We use the size, since this will
     ** also allow us to retrieve it later.
@@ -33,7 +33,7 @@ static char* Alloc (void)
 
 
 
-static void Free (unsigned char* P)
+static void Free (char* P)
 /* Check a memory block and free it */
 {
     unsigned char I;
diff --git a/targettest/strdup-test.c b/targettest/strdup-test.c
index 2fcc9816f..8e7ae87d8 100644
--- a/targettest/strdup-test.c
+++ b/targettest/strdup-test.c
@@ -5,7 +5,7 @@
 
 #include <_heap.h>
 
-static unsigned char* V[256];
+static char* V[256];
 
 static void ShowInfo (void)
 /* Show heap info */
diff --git a/targettest/tinyshell.c b/targettest/tinyshell.c
index c83bd14e8..71e9b56e3 100644
--- a/targettest/tinyshell.c
+++ b/targettest/tinyshell.c
@@ -60,13 +60,13 @@ extern unsigned int getsp(void);  /* comes from getsp.s */
 static unsigned char verbose;
 static unsigned char terminate;
 static unsigned char cmd;
-static unsigned char *cmd_asc, *arg1, *arg2, *arg3, *args;  /* 'args': everything after command */
-static unsigned char keyb_buf[KEYB_BUFSZ + 1];
-static unsigned char keyb_buf2[KEYB_BUFSZ + 1];
+static char *cmd_asc, *arg1, *arg2, *arg3, *args;  /* 'args': everything after command */
+static char keyb_buf[KEYB_BUFSZ + 1];
+static char keyb_buf2[KEYB_BUFSZ + 1];
 static size_t cpbuf_sz = 4096;
 
 struct cmd_table {
-    unsigned char *name;
+    char *name;
     unsigned char code;
 } cmd_table[] = {
     { "help",  CMD_HELP },
@@ -196,7 +196,7 @@ static void cmd_help(void)
 static void cmd_ls(void)
 {
     DIR *dir;
-    unsigned char *arg;
+    char *arg;
     struct dirent *dirent;
 #ifdef __ATARI__
     char need_free = 0;
@@ -356,7 +356,7 @@ static void cmd_rename(void)
 
 static void cmd_exec(void)
 {
-    unsigned char *progname, *arguments;
+    char *progname, *arguments;
 
     progname = strtok(args, " \t\n");
     if (! progname) {
@@ -373,7 +373,7 @@ static void cmd_exec(void)
 static void cmd_copy(void)
 {
     int srcfd = -1, dstfd = -1;
-    unsigned char *buf;
+    char *buf;
     int readsz, writesz;
 
     if (!arg2 || arg3) {