diff --git a/src/Makefile b/src/Makefile
index d3ffb9a..b4f55c1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -177,7 +177,7 @@ GCCVER    = 4
 WARN     = -W -Wall -Wwrite-strings -Wpointer-arith -Wsign-compare #-Wunreachable-code
 OPTFLAGS = -O3 -fomit-frame-pointer -fno-strict-aliasing
 DEBUG    = -DDEBUG -fno-omit-frame-pointer #-O0
-DEBUGSYM = -g -gstabs
+DEBUGSYM = -g
 CFLAGS   = -I. -I./include $(CPU) $(WARN) $(OPTFLAGS) $(DEBUG) $(DEBUGSYM)
 LDFLAGS  = $(CPU) $(DEBUGSYM)
 LDLIBS   = -L$(LIB)
diff --git a/src/createcatsrc.c b/src/createcatsrc.c
index 44a89b6..7c7e73d 100644
--- a/src/createcatsrc.c
+++ b/src/createcatsrc.c
@@ -230,6 +230,7 @@ void WriteBinChar(int c)
 
         case OutputMode_Ascii:
           putc('\'', OutputFile);
+	  /* fall-through */
 
         case OutputMode_Bin:
           fprintf(OutputFile, ",$%02x", c & 0xff);
@@ -652,7 +653,7 @@ void CreateSourceFile(char *SourceFile, char *TemplateFile, char *CDFile)
                     char *start;
                     char _StrLen[20 + 1];
 
-                    snprintf(_StrLen, sizeof(_StrLen), "%020" PRIx32, (long unsigned int)cs->ID);
+                    snprintf(_StrLen, sizeof(_StrLen), "%020" PRIx32, (unsigned int)cs->ID);
                     start = &_StrLen[20 - _len * 2];
                     while(_len > 0)
                     {
@@ -667,7 +668,7 @@ void CreateSourceFile(char *SourceFile, char *TemplateFile, char *CDFile)
                     char *start;
                     char _StrLen[20 + 1];
 
-                    snprintf(_StrLen, sizeof(_StrLen), "%020" PRIx32, (long unsigned int)((CalcRealLength(cs->CD_Str) + 1) & 0xfffffe));
+                    snprintf(_StrLen, sizeof(_StrLen), "%020" PRIx32, (unsigned int)((CalcRealLength(cs->CD_Str) + 1) & 0xfffffe));
                     start = &_StrLen[20 - _len * 2];
                     while(_len > 0)
                     {
diff --git a/src/swapfuncs.c b/src/swapfuncs.c
index 0a3a3ef..9dfcaff 100644
--- a/src/swapfuncs.c
+++ b/src/swapfuncs.c
@@ -53,8 +53,12 @@ int SwapChoose(void)
   unsigned short w;
   uint32 d;
 
-  strncpy((char *)&w, "\1\2", 2);
-  strncpy((char *)&d, "\1\2\3\4", 4);
+  ((char *)&w)[0]=1;
+  ((char *)&w)[1]=2;
+  ((char *)&d)[0]=1;
+  ((char *)&d)[1]=2;
+  ((char *)&d)[2]=3;
+  ((char *)&d)[3]=4;
 
   if(w == 0x0201)
     SwapWord = SwapWord21;