diff --git a/firmware/Makefile b/firmware/Makefile
index 37a490a..f3ad859 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -9,7 +9,7 @@ objdir       = $(srcdir)
 install_firmware: $(objdir)/.installed
 
 $(objdir)/.installed: $(srcdir)/.dirstamp | $(DESTDIR)/lib/firmware
-	cp -Rv $(srcdir)/* $(DESTDIR)/lib/firmware
+	$(MAKE) DESTDIR=$(DESTDIR) -C $(srcdir) install
 
 $(DESTDIR)/lib/firmware:
 	install -d $@
diff --git a/include/mk/hhl.staticlib.mk b/include/mk/hhl.staticlib.mk
index 737d047..e6f9454 100644
--- a/include/mk/hhl.staticlib.mk
+++ b/include/mk/hhl.staticlib.mk
@@ -26,6 +26,7 @@ $(libdir)/$(staticlib): $(staticlib) | $(libdir)
 	install $< $@
 
 clean:
+	$(info $(grn)=== Cleaning for $(staticlib) ===$(reset))
 	rm -rf $(objdir) $(staticlib)
 
 .PHONY: all clean
diff --git a/kernel/config-aarch64-5.19.3.config b/kernel/config-aarch64-5.19.4.config
similarity index 100%
rename from kernel/config-aarch64-5.19.3.config
rename to kernel/config-aarch64-5.19.4.config
diff --git a/world/fs_skeleton/etc/profile.d/dircolors.sh b/world/fs_skeleton/etc/profile.d/dircolors.sh
index 42d7b7b..f45069e 100644
--- a/world/fs_skeleton/etc/profile.d/dircolors.sh
+++ b/world/fs_skeleton/etc/profile.d/dircolors.sh
@@ -1,8 +1,8 @@
 # Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
-if [ -f "/etc/dircolors" ] ; then
- eval $(dircolors -b /etc/dircolors)
+if [ -f "/etc/dircolors" ]
+  then eval $(dircolors -b /etc/dircolors)
 fi
 
-if [ -f "$HOME/.dircolors" ] ; then
- eval $(dircolors -b $HOME/.dircolors)
+if [ -f "$HOME/.dircolors" ]
+  then eval $(dircolors -b $HOME/.dircolors)
 fi
diff --git a/world/fs_skeleton/etc/profile.d/pkgsrc.sh b/world/fs_skeleton/etc/profile.d/pkgsrc.sh
index e8d518c..f7f5579 100644
--- a/world/fs_skeleton/etc/profile.d/pkgsrc.sh
+++ b/world/fs_skeleton/etc/profile.d/pkgsrc.sh
@@ -15,8 +15,10 @@ fi
 if [ -x /usr/pkg/share/man ]
   then MANPATH=/usr/pkg/share/man:${MANPATH}
 fi
+if [ -x /usr/pkg/man ]
+  then MANPATH=/usr/pkg/man:${MANPATH}
+fi
 if [ -x /usr/pkg/share/info ]
   then INFOPATH=/usr/pkg/share/info:${INFOPATH}
 fi
-PKG_PATH=https://hitchhiker-linux.org/pub/${OS_VERSION}/${arch}/packages
-export PATH PKG_CONFIG_PATH MANPATH INFOPATH PKG_PATH
+export PATH PKG_CONFIG_PATH MANPATH INFOPATH
diff --git a/world/fs_skeleton/etc/zshenv b/world/fs_skeleton/etc/zshenv
index ba396f7..69593c4 100644
--- a/world/fs_skeleton/etc/zshenv
+++ b/world/fs_skeleton/etc/zshenv
@@ -1,14 +1,12 @@
 if [ $UID = 0 ]
- then PATH=/usr/bin:/usr/sbin:/bin:/sbin
- if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:/usr/local/sbin:${PATH} ; fi
+  then PATH=/usr/bin:/usr/sbin:/bin:/sbin
+  if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:/usr/local/sbin:${PATH} ; fi
 else
  PATH=/usr/bin:/bin
- if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:${PATH} ; fi
-fi
-if [ -d ${HOME}/bin ]
- then PATH=${HOME}/bin:PATH
+  if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:${PATH} ; fi
 fi
+if [ -d ${HOME}/bin ] ; then PATH=${HOME}/bin:${PATH} ; fi
 export PATH
 for script in /etc/zshenv.d/*.zsh
- do source ${script}
+  do source ${script}
 done
diff --git a/world/fs_skeleton/etc/zshenv.d/dircolors.zsh b/world/fs_skeleton/etc/zshenv.d/dircolors.zsh
index 42d7b7b..f45069e 100644
--- a/world/fs_skeleton/etc/zshenv.d/dircolors.zsh
+++ b/world/fs_skeleton/etc/zshenv.d/dircolors.zsh
@@ -1,8 +1,8 @@
 # Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
-if [ -f "/etc/dircolors" ] ; then
- eval $(dircolors -b /etc/dircolors)
+if [ -f "/etc/dircolors" ]
+  then eval $(dircolors -b /etc/dircolors)
 fi
 
-if [ -f "$HOME/.dircolors" ] ; then
- eval $(dircolors -b $HOME/.dircolors)
+if [ -f "$HOME/.dircolors" ]
+  then eval $(dircolors -b $HOME/.dircolors)
 fi
diff --git a/world/fs_skeleton/etc/zshenv.d/pkgsrc.zsh b/world/fs_skeleton/etc/zshenv.d/pkgsrc.zsh
index ab2d20f..dc82d0c 100644
--- a/world/fs_skeleton/etc/zshenv.d/pkgsrc.zsh
+++ b/world/fs_skeleton/etc/zshenv.d/pkgsrc.zsh
@@ -15,6 +15,9 @@ fi
 if [ -x /usr/pkg/share/man ]
   then MANPATH=/usr/pkg/share/man:${MANPATH}
 fi
+if [ -x /usr/pkg/man ]
+  then MANPATH=/usr/pkg/man:${MANPATH}
+fi
 if [ -x /usr/pkg/share/info ]
   then INFOPATH=/usr/pkg/share/info:${INFOPATH}
 fi
diff --git a/world/libcap/Makefile b/world/libcap/Makefile
index 066c5fb..9d4abd1 100644
--- a/world/libcap/Makefile
+++ b/world/libcap/Makefile
@@ -11,6 +11,6 @@ makeflags      += lib=lib
 export BUILD_CC = gcc
 export SYSROOT  = $(DESTDIR)
 export CROSS_COMPILE = $(tgt)-
-export COPTS    = -O2 --sysroot=$(DESTDIR)
+export COPTS    = -O2
 post_install    = chmod 755 $(DESTDIR)/lib/libcap.so.$(libcap_version)
 include targets.mk