diff --git a/source/examples/metacallcli/CMakeLists.txt b/source/examples/metacallcli/CMakeLists.txt
index 1ecbc4b90..0c86cf657 100644
--- a/source/examples/metacallcli/CMakeLists.txt
+++ b/source/examples/metacallcli/CMakeLists.txt
@@ -125,8 +125,6 @@ install(TARGETS ${target}
 # Define test
 #
 
-set(TEST_COMMAND_LINE_ARGS "test.mock")
-
 if(WIN32)
 	set(TEST_COMMAND cmd /c)
 else()
@@ -134,7 +132,7 @@ else()
 endif()
 
 add_test(NAME ${target}
-	COMMAND ${TEST_COMMAND} "echo 'inspect\nexit' | $<TARGET_FILE:${target}> ${TEST_COMMAND_LINE_ARGS}"
+	COMMAND ${TEST_COMMAND} "echo 'load mock a.mock\ninspect\nexit' | $<TARGET_FILE:${target}>"
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/source/examples/metacallcli/application.cpp b/source/examples/metacallcli/application.cpp
index aa5ab4f75..58792d066 100644
--- a/source/examples/metacallcli/application.cpp
+++ b/source/examples/metacallcli/application.cpp
@@ -341,10 +341,8 @@ void application::parameter_iterator::operator()(const char * parameter)
 
 	const std::string tag = extension_to_tag[script.substr(script.find_last_of(".") + 1)];
 
-	if (!app.load(tag, script))
-	{
-		app.shutdown();
-	}
+	app.load(tag, script);
+	app.shutdown();
 }
 
 bool application::load(const std::string & tag, const std::string & script)
diff --git a/source/ports/node_port/README.md b/source/ports/node_port/README.md
index 7c707945c..8fd5381cb 100644
--- a/source/ports/node_port/README.md
+++ b/source/ports/node_port/README.md
@@ -15,9 +15,9 @@ Install MetaCall binaries first:
 curl -sL https://raw.githubusercontent.com/metacall/install/master/install.sh | bash
 ```
 
-Then install NodeJS package:
+Then install MetaCall NodeJS package through MetaCall:
 ```bash
-metacall install node metacall
+metacall npm install metacall
 ```
 
 # Example
@@ -38,5 +38,5 @@ metacall('sum', 3, 4); // 7
 ```
 
 ``` sh
-metacall load node main.js
+metacall main.js
 ```
diff --git a/source/ports/node_port/package.json b/source/ports/node_port/package.json
index 2b5bb4bd0..d1e96e397 100644
--- a/source/ports/node_port/package.json
+++ b/source/ports/node_port/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "metacall",
-	"version": "0.1.8",
+	"version": "0.1.9",
 	"description": "Call Python, C#, Ruby... functions from NodeJS (a NodeJS Port for MetaCall)",
 	"repository": "github:metacall/core",
 	"bugs": "https://github.com/metacall/core/issues",
diff --git a/source/ports/py_port/package/README.rst b/source/ports/py_port/package/README.rst
index 98c83d78e..2c6dfd9c7 100644
--- a/source/ports/py_port/package/README.rst
+++ b/source/ports/py_port/package/README.rst
@@ -21,11 +21,11 @@ Install MetaCall binaries first:
 
    curl -sL https://raw.githubusercontent.com/metacall/install/master/install.sh | bash
 
-Then install Python package through MetaCall:
+Then install MetaCall Python package through MetaCall:
 
 .. code:: console
 
-   metacall install py metacall
+   metacall pip3 install metacall
 
 Example
 ========
@@ -52,4 +52,4 @@ Running the example:
 
 .. code:: console
 
-   metacall load py main.py
+   metacall main.py
diff --git a/source/ports/py_port/package/setup.py b/source/ports/py_port/package/setup.py
index f3c2095ed..a0db8369e 100644
--- a/source/ports/py_port/package/setup.py
+++ b/source/ports/py_port/package/setup.py
@@ -39,7 +39,7 @@
 	# Versions should comply with PEP440.  For a discussion on single-sourcing
 	# the version across setup.py and the project code, see
 	# https://packaging.python.org/en/latest/single_source_version.html
-	'version': '0.1.17',
+	'version': '0.1.18',
 
 	'description': 'A library for providing inter-language foreign function interface calls',
 	'long_description': long_description,