diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst
index ddb550db06..b8cc85f521 100644
--- a/docs/GettingStarted.rst
+++ b/docs/GettingStarted.rst
@@ -187,7 +187,7 @@ Launch the Heat services
 
 ::
 
-    sudo -E bash -c 'heat-api & heat-engine &'
+    sudo -E bash -c 'heat-api & heat-engine & heat-metadata &'
 
 ..
     sleep 5
diff --git a/tools/uninstall-heat b/tools/uninstall-heat
index 1cb79a6060..e05ba01799 100755
--- a/tools/uninstall-heat
+++ b/tools/uninstall-heat
@@ -25,7 +25,7 @@ user_wants() {
     done
 }
 
-HEAT_PIDS=`pgrep '^heat-(api|engine)$'`
+HEAT_PIDS=`pgrep '^heat-(api|engine|metadata)$'`
 if [ -n "$HEAT_PIDS" ]; then
     echo 'The following Heat processes are running:' 1>&2
     ps $HEAT_PIDS 1>&2