diff --git a/src/apps/terminal/Shell.cpp b/src/apps/terminal/Shell.cpp
index b90005d0ee..97906875cf 100644
--- a/src/apps/terminal/Shell.cpp
+++ b/src/apps/terminal/Shell.cpp
@@ -86,7 +86,7 @@
 /*
  * Set environment variable.
  */
-#if !defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
 
 extern char **environ;
 
@@ -102,7 +102,7 @@ setenv(const char *var, const char *value, bool overwrite)
 			/* found it */
 			if (overwrite) {
 				environ[envindex] = (char *)malloc((unsigned)len + val_len + 2);
-				snprintf(environ[envindex], "%s=%s", var, value);
+				sprintf(environ[envindex], "%s=%s", var, value);
 			}
 			return 0;
 		}
diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp
index a6f887161b..d724bc97ec 100644
--- a/src/apps/terminal/TermApp.cpp
+++ b/src/apps/terminal/TermApp.cpp
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 
 static bool sUsageRequested = false;
diff --git a/src/apps/terminal/TermBuffer.cpp b/src/apps/terminal/TermBuffer.cpp
index b816c3d9a7..1e7d3313f4 100644
--- a/src/apps/terminal/TermBuffer.cpp
+++ b/src/apps/terminal/TermBuffer.cpp
@@ -200,7 +200,7 @@ TermBuffer::GetString(int row, int col, int num, uchar *buf,
 		if (ptr->attr != (ptr + 1)->attr)
 			return all_count;
 
-		buf = (uchar *)index((char *)buf, 0x00);
+		buf += strlen((char *)buf);
 		ptr++;
 		col++;