diff --git a/fabcar/go/runfabcar.sh b/fabcar/go/runfabcar.sh
index 13792521..565784bf 100755
--- a/fabcar/go/runfabcar.sh
+++ b/fabcar/go/runfabcar.sh
@@ -1,7 +1,8 @@
+#!/bin/sh
 
-ENV_DAL=`echo $DISCOVERY_AS_LOCALHOST`
+ENV_DAL="$DISCOVERY_AS_LOCALHOST"
 
-echo "ENV_DAL:"$DISCOVERY_AS_LOCALHOST
+echo "ENV_DAL:""$DISCOVERY_AS_LOCALHOST"
 
 if [ "$ENV_DAL" != "true" ]
 then
diff --git a/fabcar/startFabric.sh b/fabcar/startFabric.sh
index 8ce18cb3..8d8d41aa 100755
--- a/fabcar/startFabric.sh
+++ b/fabcar/startFabric.sh
@@ -11,9 +11,9 @@ set -e
 export MSYS_NO_PATHCONV=1
 starttime=$(date +%s)
 CC_SRC_LANGUAGE=${1:-"go"}
-CC_SRC_LANGUAGE=`echo "$CC_SRC_LANGUAGE" | tr [:upper:] [:lower:]`
+CC_SRC_LANGUAGE=$(echo "$CC_SRC_LANGUAGE" | tr '[:upper:]' '[:lower:]')
 
-if [ "$CC_SRC_LANGUAGE" = "go" -o "$CC_SRC_LANGUAGE" = "golang" ] ; then
+if [ "$CC_SRC_LANGUAGE" = "go" ] -o [ "$CC_SRC_LANGUAGE" = "golang" ] ; then
 	CC_SRC_PATH="../chaincode/fabcar/go/"
 elif [ "$CC_SRC_LANGUAGE" = "javascript" ]; then
 	CC_SRC_PATH="../chaincode/fabcar/javascript/"
@@ -22,7 +22,7 @@ elif [ "$CC_SRC_LANGUAGE" = "java" ]; then
 elif [ "$CC_SRC_LANGUAGE" = "typescript" ]; then
 	CC_SRC_PATH="../chaincode/fabcar/typescript/"
 else
-	echo The chaincode language ${CC_SRC_LANGUAGE} is not supported by this script
+	echo The chaincode language "${CC_SRC_LANGUAGE}" is not supported by this script
 	echo Supported chaincode languages are: go, java, javascript, and typescript
 	exit 1
 fi
@@ -37,7 +37,7 @@ rm -rf go/wallet/*
 pushd ../test-network
 ./network.sh down
 ./network.sh up createChannel -ca -s couchdb
-./network.sh deployCC -ccn fabcar -ccv 1 -cci initLedger -ccl ${CC_SRC_LANGUAGE} -ccp ${CC_SRC_PATH}
+./network.sh deployCC -ccn fabcar -ccv 1 -cci initLedger -ccl "${CC_SRC_LANGUAGE}" -ccp "${CC_SRC_PATH}"
 popd
 
 cat <<EOF