diff --git a/app/system/language.cpp b/app/system/language.cpp
index f9b88489..6c43e18a 100644
--- a/app/system/language.cpp
+++ b/app/system/language.cpp
@@ -53,7 +53,7 @@ char* Language::UntagText(const char* text)
     }
 
     unsigned int count = sizeof(texttags) / sizeof(texttag);
-    char *untagged = new char[StrLen(text)];
+    char *untagged = new char[StrLen(text) * 2];
     Untag(untagged, text, (texttag*)texttags, count);
 
     unsigned int len = StrLen(untagged) + 1;
diff --git a/app/system/preferences.cpp b/app/system/preferences.cpp
index 96e23170..d8608c8f 100644
--- a/app/system/preferences.cpp
+++ b/app/system/preferences.cpp
@@ -44,6 +44,7 @@ PreferencesBase::PreferencesBase()
 PreferencesBase::~PreferencesBase()
 {
     delete buf;
+    delete prompt;
 }
 
 void PreferencesBase::SetDefaults()
diff --git a/app/system/program_amiga.cpp b/app/system/program_amiga.cpp
index 6d927872..059e4307 100644
--- a/app/system/program_amiga.cpp
+++ b/app/system/program_amiga.cpp
@@ -52,7 +52,6 @@ AmigaProgram::AmigaProgram()
 {
     rdargs = NULL;
     args.shell = FALSE;
-    args.quiet = FALSE;
     args.input = NULL;
     Console = NULL;
 }
@@ -75,17 +74,12 @@ void AmigaProgram::Initialize(int argc, char **argv)
         return;
     }
 
-//    rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (IPTR*)&args, 0);
-    rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (IPTR*)&args, 0);
+    rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (IPTR)&args, 0);
     if (!rdargs)
     {
         PrintFault(IoErr(), (STRPTR)argv[0]);
     }
 
-    if (!args.quiet) {
-        //TODO
-    }
-
     if (args.shell) {
         Console = new AmigaShellConsole(Preferences->GetPrompt());
         return;
diff --git a/app/system/program_amiga.h b/app/system/program_amiga.h
index f2dfb455..1a912124 100644
--- a/app/system/program_amiga.h
+++ b/app/system/program_amiga.h
@@ -30,7 +30,6 @@ struct RDArgs;
 
 struct amathargs {
     long shell;
-    long quiet;
     char *input;
 };
 
diff --git a/app/system/program_stdc.cpp b/app/system/program_stdc.cpp
index cd0c580f..7558128e 100644
--- a/app/system/program_stdc.cpp
+++ b/app/system/program_stdc.cpp
@@ -39,7 +39,6 @@
 StandardProgram::StandardProgram()
     : Program()
 {
-    Graphs = NOMEM;
     Console = NOMEM;
 }
 
diff --git a/lib/platform.h b/lib/platform.h
index 42322a85..e1f6e11c 100644
--- a/lib/platform.h
+++ b/lib/platform.h
@@ -109,7 +109,7 @@ typedef u_int8_t    uint8_t;
 typedef u_int16_t   uint16_t;
 typedef u_int32_t   uint32_t;
 typedef u_int64_t   uint64_t;
-# define IPTR LONG
+# define IPTR LONG*
 #endif
 
 #endif