diff --git a/tools/Diagnostics/Diagnostics.ino b/tools/Diagnostics/Diagnostics.ino
index c44aa48..86bf842 100644
--- a/tools/Diagnostics/Diagnostics.ino
+++ b/tools/Diagnostics/Diagnostics.ino
@@ -45,7 +45,9 @@
 // Chips without internal buffering (A6/A7, ESP8266, M590)
 // need enough space in the buffer for the entire response
 // else data will be lost (and the http library will fail).
+#ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 1024
+#endif
 
 // See all AT commands, if wanted
 // #define DUMP_AT_COMMANDS
@@ -106,7 +108,7 @@ const char resource[] = "/TinyGSM/logo.txt";
   TinyGsm modem(SerialAT);
 #endif
 
-#ifdef USE_SSL
+#ifdef USE_SSL && defined TINY_GSM_MODEM_HAS_SSL
   TinyGsmClientSecure client(modem);
   const int  port = 443;
 #else
diff --git a/tools/FactoryReset/FactoryReset.ino b/tools/FactoryReset/FactoryReset.ino
index 615d981..91cde6d 100644
--- a/tools/FactoryReset/FactoryReset.ino
+++ b/tools/FactoryReset/FactoryReset.ino
@@ -48,7 +48,7 @@ void setup() {
   delay(10);
 
   // Set GSM module baud rate
-  SerialAT.begin(115200);
+  SerialAT.begin(9600);
   delay(3000);
 
   if (!modem.init()) {