diff --git a/common.mk b/common.mk
index 82a6cc1..94610a2 100644
--- a/common.mk
+++ b/common.mk
@@ -95,7 +95,7 @@ WHOLE_ARCHIVES =
 define component_compile_rules
 $(1)_DEFAULT_ROOT := $(dir $(lastword $(MAKEFILE_LIST)))
 $(1)_ROOT ?= $$($(1)_DEFAULT_ROOT)
-$(1)_OBJ_DIR   = $(call lc,$(BUILD_DIR)$(1)/)
+$(1)_OBJ_DIR   = $(call lc,$(BUILD_DIR)$(1))
 ### determine source files and object files ###
 $(1)_SRC_FILES ?= $$(foreach sdir,$$($(1)_SRC_DIR), 				\
 			$$(wildcard $$(sdir)/*.c) $$(wildcard $$(sdir)/*.S) 	\
@@ -120,20 +120,20 @@ $(1)_AR = $(call lc,$(BUILD_DIR)$(1).a)
 $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.c $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR)
 	$(vecho) "CC $$<"
 	$(Q) mkdir -p $$(dir $$@)
-	$$($(1)_CC_BASE) $$($(1)_CFLAGS) -c $$< -o $$@
 	$$($(1)_CC_BASE) $$($(1)_CFLAGS) -MM -MT $$@ -MF $$(@:.o=.d) $$<
+	$$($(1)_CC_BASE) $$($(1)_CFLAGS) -c $$< -o $$@
 
 $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.cpp $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR)
 	$(vecho) "C++ $$<"
 	$(Q) mkdir -p $$(dir $$@)
-	$$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -c $$< -o $$@
 	$$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -MM -MT $$@ -MF $$(@:.o=.d) $$<
+	$$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -c $$< -o $$@
 
 $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.S $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR)
 	$(vecho) "AS $$<"
 	$(Q) mkdir -p $$(dir $$@)
-	$$($(1)_CC_BASE) -c $$< -o $$@
 	$$($(1)_CC_BASE) -MM -MT $$@ -MF $$(@:.o=.d) $$<
+	$$($(1)_CC_BASE) -c $$< -o $$@
 
 $(1)_AR_IN_FILES = $$($(1)_OBJ_FILES)
 
diff --git a/extras/bearssl/BearSSL b/extras/bearssl/BearSSL
index 2b73849..46f7ddd 160000
--- a/extras/bearssl/BearSSL
+++ b/extras/bearssl/BearSSL
@@ -1 +1 @@
-Subproject commit 2b738493bd16d57fdb12d38d03631981370259be
+Subproject commit 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0
diff --git a/lwip/esp_interface.c b/lwip/esp_interface.c
index 77ad177..73fd6e1 100644
--- a/lwip/esp_interface.c
+++ b/lwip/esp_interface.c
@@ -365,7 +365,7 @@ ethernetif_init(struct netif *netif)
     /* Initialize interface hostname */
     char *hostname = NULL;
     /* Disabled for now as there were reports of crashes here, sysparam issues */
-    /* sysparam_get_string("hostname", &hostname); */
+    sysparam_get_string("hostname", &hostname);
     if (hostname && strlen(hostname) == 0) {
         free(hostname);
         hostname = NULL;
diff --git a/parameters.mk b/parameters.mk
index d133ef5..2299920 100644
--- a/parameters.mk
+++ b/parameters.mk
@@ -10,7 +10,7 @@
 
 # Flash size in megabits
 # Valid values are same as for esptool.py - 2,4,8,16,32
-FLASH_SIZE ?= 16
+FLASH_SIZE ?= 2MB
 
 # Flash mode, valid values are same as for esptool.py - qio,qout,dio.dout
 FLASH_MODE ?= qio
@@ -30,7 +30,7 @@ ESPPORT ?= /dev/ttyUSB0
 ESPBAUD ?= 115200
 
 # firmware tool arguments
-ESPTOOL_ARGS=-fs $(FLASH_SIZE)m -fm $(FLASH_MODE) -ff $(FLASH_SPEED)m
+ESPTOOL_ARGS=-fs $(FLASH_SIZE) -fm $(FLASH_MODE) -ff $(FLASH_SPEED)m
 
 
 # set this to 0 if you don't need floating point support in printf/scanf
@@ -90,7 +90,7 @@ C_CXX_FLAGS ?= -Wall -Wl,-EL -nostdlib $(EXTRA_C_CXX_FLAGS)
 # Flags for C only
 CFLAGS		?= $(C_CXX_FLAGS) -std=gnu99 $(EXTRA_CFLAGS)
 # Flags for C++ only
-CXXFLAGS	?= $(C_CXX_FLAGS) -std=c++0x -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS)
+CXXFLAGS	?= $(C_CXX_FLAGS) -std=c++11 -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS)
 
 # these aren't all technically preprocesor args, but used by all 3 of C, C++, assembler
 CPPFLAGS	+= -mlongcalls -mtext-section-literals