diff --git a/nimble/host/mesh/src/access.c b/nimble/host/mesh/src/access.c
index 6df342afe..28402885c 100644
--- a/nimble/host/mesh/src/access.c
+++ b/nimble/host/mesh/src/access.c
@@ -866,7 +866,6 @@ int bt_mesh_model_extend(struct bt_mesh_model *extending_mod, struct bt_mesh_mod
 		a->next = b;
 	}
 
-	mod->extends = base_mod;
 	return 0;
 }
 #endif
diff --git a/nimble/host/mesh/src/adv_legacy.c b/nimble/host/mesh/src/adv_legacy.c
index eed3456dd..ab8a92161 100644
--- a/nimble/host/mesh/src/adv_legacy.c
+++ b/nimble/host/mesh/src/adv_legacy.c
@@ -15,6 +15,7 @@
 #include "beacon.h"
 #include "prov.h"
 #include "proxy.h"
+#include "mesh/glue.h"
 #include "pb_gatt_srv.h"
 
 #if MYNEWT_VAL(BLE_MESH_ADV_LEGACY)
@@ -29,7 +30,6 @@
 
 static int32_t adv_int_min =  ADV_INT_DEFAULT_MS;
 
-#if !MYNEWT_VAL(BLE_EXT_ADV)
 static int adv_initialized = false;
 /* TinyCrypt PRNG consumes a lot of stack space, so we need to have
  * an increased call stack whenever it's used.
@@ -42,7 +42,6 @@ static os_membuf_t adv_buf_mem[OS_MEMPOOL_SIZE(
 	MYNEWT_VAL(BLE_MESH_ADV_BUF_COUNT),
 	BT_MESH_ADV_DATA_SIZE + BT_MESH_MBUF_HEADER_SIZE)];
 static struct os_mempool adv_buf_mempool;
-#endif
 static struct ble_npl_eventq adv_queue;
 
 static inline void adv_send(struct os_mbuf *buf)
diff --git a/nimble/host/mesh/src/glue.c b/nimble/host/mesh/src/glue.c
index 80f9b7e75..c7b2cc16f 100644
--- a/nimble/host/mesh/src/glue.c
+++ b/nimble/host/mesh/src/glue.c
@@ -834,14 +834,13 @@ bt_le_adv_start(const struct ble_gap_adv_params *param,
 
     return 0;
 }
+#endif
 
 int bt_le_adv_stop()
 {
-	return ble_gap_adv_stop();
+    return ble_gap_adv_stop();
 }
 
-#endif
-
 #if MYNEWT_VAL(BLE_MESH_PROXY)
 int bt_mesh_proxy_svcs_register(void);
 #endif
diff --git a/nimble/host/mesh/src/proxy_srv.c b/nimble/host/mesh/src/proxy_srv.c
index dae61a4a1..7fa297fa7 100644
--- a/nimble/host/mesh/src/proxy_srv.c
+++ b/nimble/host/mesh/src/proxy_srv.c
@@ -932,7 +932,7 @@ static void ble_mesh_handle_connect(struct ble_gap_event *event, void *arg)
 		gatt_connected(event->adv_complete.conn_handle);
 #if MYNEWT_VAL(BLE_MESH_PB_GATT)
 		gatt_connected_pb_gatt(event->adv_complete.conn_handle,
-				       event->adv_complete.status);
+				       event->adv_complete.reason);
 #endif
 	}
 #else