diff --git a/apps/tagcache.c b/apps/tagcache.c
index 43b4ad6e3b..0204771ffa 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -2641,11 +2641,11 @@ bool tagcache_modify_numeric_entry(struct tagcache_search *tcs,
 
 static bool write_tag(int fd, const char *tagstr, const char *datastr)
 {
-    char buf[256];
+    char buf[512];
     int i;
     
     snprintf(buf, sizeof buf, "%s=\"", tagstr);
-    for (i = strlen(buf); i < (long)sizeof(buf)-2; i++)
+    for (i = strlen(buf); i < (long)sizeof(buf)-3; i++)
     {
         if (*datastr == '\0')
             break;
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 7b4b99aa79..989f50a283 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -25,7 +25,7 @@
 #undef MAX_PATH /* this avoids problems when building simulator */
 #define MAX_PATH 260
 
-#define MAX_OPEN_FILES 8
+#define MAX_OPEN_FILES 11
 
 #ifndef SEEK_SET
 #define SEEK_SET 0