diff --git a/Makefile b/Makefile
index fe5fef79..93c341f6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ INCS ?= -Isrc -I.
 SSL ?= MBEDTLS
 CWD ?= $(realpath $(CURDIR))
 ENV ?=  -e Tmp=. -e WINEDEBUG=-all 
-DOCKERCMD ?= docker run --platform=linux/amd64
-DOCKER ?= $(DOCKERCMD) --rm $(ENV) -v $(CWD):$(CWD) -w $(CWD)
+D ?= docker
+DOCKER ?= $(D) run --rm $(ENV) -v $(CWD):$(CWD) -w $(CWD)
 VCFLAGS = /nologo /W3 /O2 /MD /I. $(DEFS) $(TFLAGS)
 IPV6 ?= 1
 ASAN ?= -fsanitize=address,undefined -fno-sanitize-recover=all
diff --git a/examples/mqtt-client-aws-iot/Makefile b/examples/mqtt-client-aws-iot/Makefile
index d89293ab..26fdbf05 100644
--- a/examples/mqtt-client-aws-iot/Makefile
+++ b/examples/mqtt-client-aws-iot/Makefile
@@ -1,11 +1,20 @@
 PROG ?= example
-CFLAGS ?= -W -Wall -O2 -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509
+CFLAGS ?= -W -Wall -Wextra -O2
+SSL ?= MBEDTLS
+
+ifeq "$(SSL)" "MBEDTLS"
+CFLAGS += -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509 -L$(MBEDTLS)/lib -I$(MBEDTLS)/include
+endif
+
+ifeq "$(SSL)" "OPENSSL"
+CFLAGS += -DMG_ENABLE_OPENSSL=1 -lssl -lcrypto -L$(OPENSSL)/lib -I$(OPENSSL)/include
+endif
 
 all: $(PROG)
 	$(RUN) ./$(PROG) $(ARGS)
 
 $(PROG): main.c
-	$(CC) main.c ../../mongoose.c -I../.. $(CFLAGS) -o $(PROG)
+	$(CC) main.c ../../mongoose.c -I../.. $(CFLAGS) $(EXTRA_CFLAGS) -o $(PROG)
 
 clean:
 	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb
diff --git a/examples/stm32/nucleo-f746zg-baremetal/Makefile b/examples/stm32/nucleo-f746zg-baremetal/Makefile
index a3db208f..63ef397d 100644
--- a/examples/stm32/nucleo-f746zg-baremetal/Makefile
+++ b/examples/stm32/nucleo-f746zg-baremetal/Makefile
@@ -1,13 +1,14 @@
 TARGET  = firmware
 ROOT    ?= $(realpath $(CURDIR)/../../..)
-DOCKER 	?= docker run --rm -v $(ROOT):$(ROOT) -w $(CURDIR) mdashnet/armgcc
+D ?= docker
+DOCKER 	?= $(D) run --rm -v $(ROOT):$(ROOT) -w $(CURDIR) mdashnet/armgcc
 CROSS   ?= arm-none-eabi
 CFLAGS  ?=  -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion \
 						-Wformat-truncation -fno-common -Wconversion \
 						-g3 -Os -ffunction-sections -fdata-sections \
 						-I. -I$(ROOT) -DMG_ARCH=MG_ARCH_NEWLIB -DMIP_DEBUG=1 \
 						-DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_LINES=1 -DMG_ENABLE_MIP=1 \
-						-mcpu=cortex-m7 -mthumb -mfloat-abi=softfp -mfpu=vfpv4 $(EXTRA)
+						-mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=auto $(EXTRA_CFLAGS)
 LDFLAGS ?= -Tlink.ld -nostartfiles -nostdlib --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
 SOURCES = boot.c main.c syscalls.c $(ROOT)/mongoose.c
 
diff --git a/examples/uart-bridge/packed_fs.c b/examples/uart-bridge/packed_fs.c
index bb7e1766..3c47413e 100644
--- a/examples/uart-bridge/packed_fs.c
+++ b/examples/uart-bridge/packed_fs.c
@@ -1812,10 +1812,10 @@ static const struct packed_file {
   size_t size;
   time_t mtime;
 } packed_files[] = {
-  {"/web_root/index.html", v1, sizeof(v1), 1654623573},
-  {"/web_root/main.js", v2, sizeof(v2), 1659000445},
-  {"/web_root/preact.min.js", v3, sizeof(v3), 1654623573},
-  {"/web_root/style.css", v4, sizeof(v4), 1655548336},
+  {"/web_root/index.html", v1, sizeof(v1), 1659483223},
+  {"/web_root/main.js", v2, sizeof(v2), 1659483223},
+  {"/web_root/preact.min.js", v3, sizeof(v3), 1659483223},
+  {"/web_root/style.css", v4, sizeof(v4), 1659483223},
   {NULL, NULL, 0, 0}
 };
 
diff --git a/examples/webui-plain/Makefile b/examples/webui-plain/Makefile
index 9addcb99..f6ad5474 100644
--- a/examples/webui-plain/Makefile
+++ b/examples/webui-plain/Makefile
@@ -1,12 +1,13 @@
 PROG ?= example
+CFLAGS ?= -W -Wall -Wextra -O2
 SSL = ?
 
 ifeq "$(SSL)" "MBEDTLS"
-CFLAGS += -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509
+CFLAGS += -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509 -L$(MBEDTLS)/lib -I$(MBEDTLS)/include
 endif
 
 ifeq "$(SSL)" "OPENSSL"
-CFLAGS += -DMG_ENABLE_OPENSSL=1 -lssl -lcrypto
+CFLAGS += -DMG_ENABLE_OPENSSL=1 -lssl -lcrypto -L$(OPENSSL)/lib -I$(OPENSSL)/include
 endif
 
 all: $(PROG)
@@ -14,7 +15,7 @@ all: $(PROG)
 
 
 $(PROG): main.c
-	$(CC) ../../mongoose.c -I../.. -W -Wall $(CFLAGS) $(EXTRA_CFLAGS) -o $(PROG) main.c
+	$(CC) ../../mongoose.c -I../.. $(CFLAGS) $(EXTRA_CFLAGS) -o $(PROG) main.c
 
 clean:
 	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb