2 files changed, 4 insertions, 2 deletions

diff --git a/firmware/asm/thread.h b/firmware/asm/thread.h
index 5372be73ab..771338b406 100644
--- a/firmware/asm/thread.h
+++ b/firmware/asm/thread.h
@@ -46,7 +46,9 @@ struct regs
      * give a decent amount of space and hope for the best...
      * FIXME: this isn't a great solution. */
     #undef MINSIGSTKSZ
-    #define MINSIGSTKSZ 16384
+    #endif
+    #ifndef MINSIGSTKSZ
+      #define MINSIGSTKSZ 16384
     #endif
     /* MINSIGSTKSZ for the OS to deliver the signal + 0x3000 for us */
     #define DEFAULT_STACK_SIZE (MINSIGSTKSZ+0x3000) /* Bytes */
diff --git a/firmware/include/string-extra.h b/firmware/include/string-extra.h
index a9b34661a7..9572638e23 100644
--- a/firmware/include/string-extra.h
+++ b/firmware/include/string-extra.h
@@ -30,7 +30,7 @@
 #include "memset16.h"
 
 #if defined(WIN32) || defined(APPLICATION) \
-        || defined(__PCTOOL__)
+        || defined(__PCTOOL__) || defined(SIMULATOR)
 #ifndef mempcpy
 #define mempcpy __builtin_mempcpy
 #endif