diff --git a/dotfiles/profile b/dotfiles/profile
index 9ce27f9..4f25761 100755
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -29,10 +29,7 @@ fi
 
 # Setup for libvirt
 if [ -z "${LIBVIRT_DEFAULT_URI:-}" ] ; then
-  if [ "$(id -u)" = "0" ] || (id -Gn 2>/dev/null | grep -q "\blibvirt\b") ; then
-    LIBVIRT_DEFAULT_URI="qemu:///system"
-    export LIBVIRT_DEFAULT_URI
-  fi
+    export LIBVIRT_DEFAULT_URI="qemu:///system"
 fi
 
 # Got rust? (gvim, etc.)
diff --git a/dotfiles/shenv b/dotfiles/shenv
index 202d139..25bfedf 100755
--- a/dotfiles/shenv
+++ b/dotfiles/shenv
@@ -29,6 +29,9 @@ export WORKON_HOME="$HOME/.virtualenvs"
 # GPG full key id
 export GPG_ID=7FD58D9A196DCEEEAD671F94F4D7A7915DEA789B
 
+# Capture uname early
+_UNAME="$(uname)"
+
 # things we need in all interactive shells
 case "$-" in
   *i*)
@@ -86,7 +89,6 @@ case "$-" in
     ;;
 esac
 
-
 # Opt out of .net telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
@@ -254,7 +256,7 @@ esac
 
 # Setup XDG-like dirs on MacOS
 # Based on https://leebyron.com/til/mac-xdg/
-if [ "$(uname)" = "Darwin" ] ; then
+if [ "${_UNAME}" = "Darwin" ] ; then
   export XDG_BIN_HOME="${XDG_BIN_HOME:-$HOME/.local/bin}"
   export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/Library/Caches}"
   export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
@@ -263,10 +265,12 @@ if [ "$(uname)" = "Darwin" ] ; then
   export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$TMPDIR/runtime-$(id -u)}"
   export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
   export PATH="${HOME}/bin/macos:${PATH}"
-elif [ "$(uname)" = "Linux" ] ; then
+elif [ "${_UNAME}" = "Linux" ] ; then
   export PATH="${HOME}/bin/linux:${PATH}"
 fi
 
+unset _UNAME
+
 if test -e "$HOME/.localenv"; then
   # shellcheck source=/dev/null
   . "$HOME/.localenv"
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 13b6abe..dd7a61f 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,8 +1,11 @@
 # For interactive shells
 [[ -n "$ZSH_PROFILE" ]] && {
   zmodload zsh/datetime
-  zshrc_start_time=$EPOCHREALTIME
   zmodload zsh/zprof
+  export PS4='+[%D{%f} / %D{%s.%N}] %N:%i> '
+  exec 3>&2 2>/tmp/zsh_startup.log
+  set -x
+  zshrc_start_time=$EPOCHREALTIME
 }
 HISTFILE=~/.zhistory
 HISTSIZE=10000
@@ -298,6 +301,8 @@ typeset -U PATH
 
 if [[ -n "$ZSH_PROFILE" ]]; then
   zshrc_end_time=$EPOCHREALTIME
+  set +x
+  exec 2>&3 3>&-
   # Calculation in ms using zsh floating point math
   elapsed_ms=$(( (zshrc_end_time - zshrc_start_time) * 1000 ))
   printf "zshrc done: %.0fms\n" "$elapsed_ms"