diff --git a/src/TEHistory.C b/src/TEHistory.C
index f5dd5b91..c7658ae6 100644
--- a/src/TEHistory.C
+++ b/src/TEHistory.C
@@ -39,6 +39,11 @@ FIXME: some complain about the history buffer comsuming the
        since the history does not behave gracefully in cases
        where the memory is used up completely. I have some
        problems to reproduce this event in my installation.
+
+FIXME: There is noticable decrease in speed, also. Perhaps,
+       there whole feature needs to be revisited therefore.
+       Disadvantage of a more elaborated say block-oriented
+       scheme with wrap around would be it's complexity.
 */
 
 
diff --git a/src/TEPty.C b/src/TEPty.C
index 60a2b697..f8d16872 100644
--- a/src/TEPty.C
+++ b/src/TEPty.C
@@ -100,10 +100,12 @@ extern "C" {
 
 #include <signal.h>
 
+#if !defined(__osf__)
 #ifdef HAVE_TERMIO_H
 /* needed at least on AIX */
 #include <termio.h>
 #endif
+#endif
 #ifdef HAVE_TERMIOS_H
 /* for HP-UX (some versions) the extern C is needed, and for other
    platforms it doesn't hurt */
diff --git a/src/TEmulation.C b/src/TEmulation.C
index 360da9f7..0a7641a9 100644
--- a/src/TEmulation.C
+++ b/src/TEmulation.C
@@ -61,7 +61,6 @@
 
 /* FIXME
    - evtl. the bulk operations could be made more transparent.
-   - evtl. shrink the history buffer after no keystrokes happend for a while.
 */
 
 #include "TEmulation.h"
diff --git a/src/konsole.C b/src/konsole.C
index 109f15ac..ad84c897 100644
--- a/src/konsole.C
+++ b/src/konsole.C
@@ -470,9 +470,9 @@ void Konsole::saveProperties(KConfig* config)
 
   if (args.count() > 0) config->writeEntry("konsolearguments", args);
   config->writeEntry("class",name());
-  config->writeEntry("defaultheight", te->height());
+  config->writeEntry("defaultheight", height());
   // for "save options". Not used by SM.
-  config->writeEntry("defaultwidth", te->width());
+  config->writeEntry("defaultwidth", width());
   // for "save options". Not used by SM.
   //config->writeEntry("kmenubar",                 //FIXME:Float
   //                   menubar->menuBarPos() == KMenuBar::Bottom ? "bottom" : "top");