diff --git a/distributions/ArchR/options b/distributions/ArchR/options
index 2e7b211ae8..be9aa54852 100644
--- a/distributions/ArchR/options
+++ b/distributions/ArchR/options
@@ -209,7 +209,7 @@
 # Partition labels for USB/SD installation media
   DISTRO_BOOTLABEL="ARCHR"
   DISTRO_ROOTLABEL="ARCHR_ROOT"
-  DISTRO_DISKLABEL="STORAGE"
+  DISTRO_DISKLABEL="ROMS"
 
 # Settings package name - blank if not required
   DISTRO_PKG_SETTINGS=""
diff --git a/packages/audio/libmodplug/package.mk b/packages/audio/libmodplug/package.mk
index 26651b2503..a74d382d0a 100644
--- a/packages/audio/libmodplug/package.mk
+++ b/packages/audio/libmodplug/package.mk
@@ -12,4 +12,4 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="libmodplug renders mod music files as raw audio data, for playing or conversion."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --enable-shared"
diff --git a/packages/audio/libsamplerate/package.mk b/packages/audio/libsamplerate/package.mk
index 5ee069e845..e3c947767f 100644
--- a/packages/audio/libsamplerate/package.mk
+++ b/packages/audio/libsamplerate/package.mk
@@ -13,7 +13,7 @@ PKG_LONGDESC="A Sample Rate Converter for audio."
 PKG_TOOLCHAIN="autotools"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
+PKG_CONFIGURE_OPTS_TARGET="--enable-shared \
                            --enable-static \
                            --datadir=/usr/share \
                            --disable-fftw \
diff --git a/packages/devel/libffi/package.mk b/packages/devel/libffi/package.mk
index 6148057157..0fb7d5d46f 100644
--- a/packages/devel/libffi/package.mk
+++ b/packages/devel/libffi/package.mk
@@ -14,7 +14,7 @@ PKG_LONGDESC="Foreign Function Interface Library."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-debug \
-                           --enable-static --disable-shared \
+                           --enable-static --enable-shared \
                            --with-pic \
                            --enable-structs \
                            --enable-raw-api \
diff --git a/packages/devel/pcre2/package.mk b/packages/devel/pcre2/package.mk
index d4a266fe85..baf2c960f9 100644
--- a/packages/devel/pcre2/package.mk
+++ b/packages/devel/pcre2/package.mk
@@ -22,7 +22,7 @@ PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \
                      -DPCRE2_SUPPORT_LIBEDIT=OFF \
                      -DPCRE2_SUPPORT_LIBREADLINE=OFF"
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
+PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON \
                        -DPCRE2_BUILD_PCRE2_8=ON \
                        -DPCRE2_BUILD_PCRE2_16=ON \
                        -DPCRE2_SUPPORT_JIT=ON \
diff --git a/projects/ArchR/packages/graphics/libwebp/package.mk b/projects/ArchR/packages/graphics/libwebp/package.mk
index d745cc933d..f380a0a244 100644
--- a/projects/ArchR/packages/graphics/libwebp/package.mk
+++ b/projects/ArchR/packages/graphics/libwebp/package.mk
@@ -10,3 +10,5 @@ PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="WebP codec is a library to encode and decode images in WebP format."
 PKG_TOOLCHAIN="cmake"
+
+PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON"
diff --git a/scripts/mkimage b/scripts/mkimage
index 88c851bc73..d9d0907c10 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -94,6 +94,9 @@ if [ "${ROOTFS_TYPE}" = "ext4" ]; then
     parted -s "${DISK}" -a min unit s mkpart primary ext4 ${ROOT_PART_START} ${ROOT_PART_END}
     parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
     parted -s "${DISK}" set 1 boot on
+    # Hide root partition from desktop file managers by setting type to 0xDA (Non-FS data).
+    # The kernel still mounts it by LABEL from the boot cmdline.
+    sfdisk --part-type "${DISK}" 2 da >"${SAVE_ERROR}" 2>&1 || true
   fi
 
   # Set SYSTEM_PART_START for boot partition (used by bootloader dd and part1 merge)