diff --git a/extras/golang.install b/extras/golang.install
index 74f362b..4a8f66d 100755
--- a/extras/golang.install
+++ b/extras/golang.install
@@ -11,6 +11,11 @@ req_go_ver="1.19"
 golang_bashrc="# Golang system path setup
 export PATH=\$PATH:/usr/local/go/bin
 "
+if [[ $OSTYPE == linux-gnu ]] ; then
+    sys_type="linux"
+else
+    sys_type="$OSTYPE"
+fi
 
 # Source PRbL Functions locally or retrieve from online
 if [ ! -z $prbl_functions ] ; then
@@ -140,7 +145,7 @@ install(){
         esac
     fi
 
-    local _golang_html=$(/usr/bin/curl -ks "https://go.dev/dl/" | grep $sys_arch | grep $req_go_ver | head -n 1)
+    local _golang_html=$(/usr/bin/curl -ks "https://go.dev/dl/" | grep $sys_type | grep $sys_arch | grep $req_go_ver | head -n 1)
     local golang_current=$(strip-html-tags "$_golang_html")
     #golang_current=$(echo "$golang_current" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
     export tmp_dir=`mktemp -d /tmp/selfextract.XXXXXX`
diff --git a/lib/skel/.bashrc.d/11-quickinfo.bashrc b/lib/skel/.bashrc.d/11-quickinfo.bashrc
index 9b15345..bd9672c 100755
--- a/lib/skel/.bashrc.d/11-quickinfo.bashrc
+++ b/lib/skel/.bashrc.d/11-quickinfo.bashrc
@@ -193,7 +193,7 @@ fi
 # TODO: optimize this to run after time delay using timestamp in settings
 set_spinner spinner19
 #spin "eval $(wan_ip=$(wget -qO- http://ipecho.net/plain \| xargs echo ))"
-spin read -r wan_ip < <(wget -qO- https://ident.me/)
+spin read -r wan_ip < <(wget -qO- http://ipecho.net/plain \| xargs echo)
 
 # Checks memory usage
 mem_usage=$(free -m | grep Mem | awk '{print $3"M/"$2"M"}')