diff --git a/bindep.txt b/bindep.txt
index 23c98213..3b4d86d2 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -3,3 +3,10 @@
 
 # Required for running the 'lspci' command
 pciutils
+
+# libsrvg2 is needed for sphinxcontrib-svg2pdfconverter in docs builds.
+librsvg2-tools [doc platform:rpm]
+librsvg2-bin [doc platform:dpkg]
+latexmk [pdf-docs]
+fonts-freefont-otf [pdf-docs]
+texlive-xetex [pdf-docs]
diff --git a/devstack/lib/cyborg b/devstack/lib/cyborg
index fed7b9bc..3da7a8ca 100644
--- a/devstack/lib/cyborg
+++ b/devstack/lib/cyborg
@@ -264,7 +264,7 @@ function start_cyborg {
 # Starts Cyborg API server.
 function start_cyborg_api {
     if [ "$CYBORG_USE_UWSGI" == "True" ]; then
-        run_process cyborg-api "$CYBORG_BIN_DIR/uwsgi --ini $CYBORG_UWSGI_CONF --procname-prefix cyborg-api"
+        run_process cyborg-api "$(which uwsgi) --ini $CYBORG_UWSGI_CONF --procname-prefix cyborg-api"
     else
         run_process cyborg-api "$CYBORG_BIN_DIR/cyborg-api --config-file $CYBORG_CONF_FILE"
     fi