diff --git a/package.json b/package.json
index 71a829bc49bde..b59b67b7543c9 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "start:inside-gb:debug": "node --inspect-brk node_modules/.bin/react-native start:inside-gb",
     "android": "react-native run-android",
     "preios": "yarn preios:carthage",
-    "preios:carthage": "pushd react-native-aztec && (yarn install-aztec-ios; popd)",
+    "preios:carthage": "cd react-native-aztec && yarn install-aztec-ios",
     "ios": "react-native run-ios",
     "test": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest.config.js",
     "test:inside-gb": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest_gb.config.js",
@@ -63,7 +63,7 @@
     "prettier": "prettier-eslint --write $npm_package_config_jsfiles $npm_package_config_scssfiles",
     "clean": "yarn clean:aztec; yarn cache clean; yarn clean:haste; yarn clean:jest; yarn clean:metro; yarn clean:react; yarn clean:watchman; yarn clean:node;",
     "clean:runtime": "yarn clean:haste; yarn clean:react; yarn clean:metro; yarn clean:jest; yarn clean:watchman; yarn clean:babel-cache",
-    "clean:aztec": "pushd react-native-aztec && (yarn clean; pushd example && (yarn clean; popd); popd)",
+    "clean:aztec": "cd react-native-aztec && yarn clean && cd example && yarn clean",
     "clean:haste": "rm -rf /tmp/haste-map-react-native-packager-*",
     "clean:install": "yarn clean; yarn",
     "clean:jest": "yarn jest --clearCache --config jest.config.js; rm -rf $TMPDIR/jest_*",
@@ -71,7 +71,7 @@
     "clean:metro": "rm -rf $TMPDIR/metro-cache-*;",
     "clean:react": "rm -rf $TMPDIR/react-*",
     "clean:node": "rm -rf node_modules",
-	"clean:watchman": "watchman watch-del-all",
+	"clean:watchman": "command -v watchman >/dev/null 2>&1 && watchman watch-del-all; true",
 	"clean:babel-cache": "rm -rf ./node_modules/.cache/babel-loader/*",
     "lint": "eslint . --ext .js",
     "lint:fix": "yarn lint --fix"