diff --git a/scripts/developer/git/setup-aliases b/scripts/developer/git/setup-aliases
index 2d996582b0284debddf288a85708702053f53270..b0f19ae7ba08e853b51459dcd103a0a980e662a7 100755
--- a/scripts/developer/git/setup-aliases
+++ b/scripts/developer/git/setup-aliases
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "Setting up git aliases..."
-if ! which clang-format 2>1 1>/dev/null
+if ! which clang-format 1>/dev/null 2>&1
 then
   echo "Warning: ADIOS uses clang-format to enforce style guidelines but no"
   echo "         clang-format binary was found in tyour path"
@@ -9,7 +9,7 @@ fi
 
 if ! git config alias.clang-format "!scripts/developer/git/git-clang-format"
 then
-  echo "Error adding clang-format alias"
+  echo "Waring: Error adding clang-format alias"
 fi
 
 exit 0
diff --git a/scripts/developer/git/setup-remotes b/scripts/developer/git/setup-remotes
index 17cac1b31d0abba2b48886f23ba531eb21616776..7756f72b626fdb1f9418c4ecae722f721b869966 100755
--- a/scripts/developer/git/setup-remotes
+++ b/scripts/developer/git/setup-remotes
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "Checking GitHub username..."
-GHUSER=$(git remote get-url origin | sed 's|.*[:/]\([^/]*\)/adios2.git|\1|')
+GHUSER=$(git remote show origin | grep "Fetch URL" | sed 's|.*[:/]\([^/]*\)/adios2.git|\1|')
 if [ -z "${GHUSER}" ]
 then
   echo "  Warning: Unable to determine GitHub username.  Are you sure you"