diff --git a/lib/keystone b/lib/keystone
index b6b2d05e27..3489bd8394 100755
--- a/lib/keystone
+++ b/lib/keystone
@@ -26,6 +26,7 @@
 XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
+source $TOP_DIR/lib/tls
 
 # Defaults
 # --------
diff --git a/unstack.sh b/unstack.sh
index 77dbe074d2..4445f1fb31 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -35,10 +35,12 @@ source $TOP_DIR/lib/apache
 
 # Get project function libraries
 source $TOP_DIR/lib/baremetal
+source $TOP_DIR/lib/ceilometer
 source $TOP_DIR/lib/cinder
 source $TOP_DIR/lib/keystone
 source $TOP_DIR/lib/glance
 source $TOP_DIR/lib/nova
+source $TOP_DIR/lib/heat
 source $TOP_DIR/lib/horizon
 source $TOP_DIR/lib/swift
 source $TOP_DIR/lib/neutron