diff --git a/ba/autorun.cpp b/ba/autorun.cpp
index a681eb3ff..f3b7530f2 100755
--- a/ba/autorun.cpp
+++ b/ba/autorun.cpp
@@ -127,12 +127,12 @@ void BuildKey()
   
 void DecodeString(char* data)
 {                             
-  char __tmp_string[256];
+  char tmp[256];
   BuildKey();
   for (int i = 0; data[i]; i++)
-    __tmp_string[i] = data[i] - (i < 8 ? key[i] : __tmp_string[i - 8]);
-  __tmp_string[i] = '\0';
-  strcpy(data, __tmp_string); 
+    tmp[i] = data[i] - (i < 8 ? key[i] : tmp[i - 8]);
+  tmp[i] = '\0';
+  strcpy(data, tmp); 
 }
 
 int ThisYear()
diff --git a/ba/ba1501.cpp b/ba/ba1501.cpp
index abc8f1ef9..8e4f81071 100755
--- a/ba/ba1501.cpp
+++ b/ba/ba1501.cpp
@@ -1,7 +1,6 @@
 #include <applicat.h>
 #include <config.h>
 #include <dongle.h>
-//#include <os_dep.h>
 #include <scanner.h>
 #include <utility.h>
 
diff --git a/ba/ba5100.cpp b/ba/ba5100.cpp
index 00f314dfc..e81836606 100755
--- a/ba/ba5100.cpp
+++ b/ba/ba5100.cpp
@@ -146,18 +146,20 @@ void TQuery_application::main_loop()
 const char* head(const TRectype& r, const char* name,
                  const char* title)
 {
-  if (title == NULL) title = name;
-
+  if (title == NULL) 
+    title = name;
+  TString& tmp = get_tmp_string();
   if (r.exist(name))
   {
     TString h(r.length(name));
     h.spaces();
     h.overwrite(title, 0);
-    strcpy(__tmp_string, h);
+    tmp = h;
   }
-  else strcpy(__tmp_string, title);
+  else 
+    tmp = title;
 
-  return __tmp_string;
+  return tmp;
 }
 
 bool TQuery_application::do_query()