diff --git a/platforms/android/README.md b/platforms/android/README.md
index 5e96eff..91de980 100644
--- a/platforms/android/README.md
+++ b/platforms/android/README.md
@@ -2,18 +2,15 @@
 
 <p align="center"><img width="50%" src="https://github.com/wasm3/wasm3/raw/master/extra/screenshot-android.png"></p>
 
-
 Install Android SDK Tools, then:
 
 ```sh
 export ANDROID_HOME=/opt/android-sdk/
-export PATH=$ANDROID_HOME/tools/bin:$PATH
-```
-
+export PATH=$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$PATH
 ```
-# On my Ubuntu, I had to:
-#export SDKMANAGER_OPTS="-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee"
 
+Install NDK:
+```sh
 sdkmanager --install ndk-bundle
 ```
 
diff --git a/source/m3_api_meta_wasi.c b/source/m3_api_meta_wasi.c
index 2633ade..262b635 100644
--- a/source/m3_api_meta_wasi.c
+++ b/source/m3_api_meta_wasi.c
@@ -371,10 +371,12 @@ M3Result  m3_LinkWASI  (IM3Module module)
 {
     M3Result result = m3Err_none;
 
-    wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
-    wasi_context->exit_code = 0;
-    wasi_context->argc = 0;
-    wasi_context->argv = 0;
+    if (!wasi_context) {
+        wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
+        wasi_context->exit_code = 0;
+        wasi_context->argc = 0;
+        wasi_context->argv = 0;
+    }
 
     static const char* namespaces[2] = { "wasi_unstable", "wasi_snapshot_preview1" };
 
diff --git a/source/m3_api_uvwasi.c b/source/m3_api_uvwasi.c
index 7e655f2..7e953f5 100644
--- a/source/m3_api_uvwasi.c
+++ b/source/m3_api_uvwasi.c
@@ -496,10 +496,12 @@ M3Result  m3_LinkWASI  (IM3Module module)
         return "uvwasi_init failed";
     }
 
-    wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
-    wasi_context->exit_code = 0;
-    wasi_context->argc = 0;
-    wasi_context->argv = 0;
+    if (!wasi_context) {
+        wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
+        wasi_context->exit_code = 0;
+        wasi_context->argc = 0;
+        wasi_context->argv = 0;
+    }
 
     static const char* namespaces[2] = { "wasi_unstable", "wasi_snapshot_preview1" };
 
diff --git a/source/m3_api_wasi.c b/source/m3_api_wasi.c
index d63e58a..132f39e 100644
--- a/source/m3_api_wasi.c
+++ b/source/m3_api_wasi.c
@@ -686,10 +686,12 @@ M3Result  m3_LinkWASI  (IM3Module module)
     }
 #endif
 
-    wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
-    wasi_context->exit_code = 0;
-    wasi_context->argc = 0;
-    wasi_context->argv = 0;
+    if (!wasi_context) {
+        wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
+        wasi_context->exit_code = 0;
+        wasi_context->argc = 0;
+        wasi_context->argv = 0;
+    }
 
     static const char* namespaces[2] = { "wasi_unstable", "wasi_snapshot_preview1" };