diff --git a/src/harfbuzz/pkg.sh b/src/harfbuzz/pkg.sh
index 5254233..f375219 100644
--- a/src/harfbuzz/pkg.sh
+++ b/src/harfbuzz/pkg.sh
@@ -5,7 +5,11 @@ VERSION="8.1.1"
 FILES=("https://github.com/harfbuzz/harfbuzz/releases/download/${VERSION}/harfbuzz-${VERSION}.tar.xz")
 HASHES=("f0040d0fc02cf94cac9f46a94c44c6de")
 
-DEPENDS=("gobject-introspection" "glib" "icu" "freetype" "cairo")
+DEPENDS=("freetype" "glib" "icu" "glibc" "graphite")
+BUILD=(
+  "cairo" "gobject-introspection" "meson"
+  "python3" "gtk-doc" "pypa-setuptools"
+)
 
 PACKAGE() {
   tar xf "${NAME}-${VERSION}.tar.xz"
diff --git a/src/webkitgtk/pkg.sh b/src/webkitgtk/pkg.sh
index f6526f2..bd875ca 100644
--- a/src/webkitgtk/pkg.sh
+++ b/src/webkitgtk/pkg.sh
@@ -7,12 +7,12 @@ HASHES=("9cf27d88b55e5b8168f4835b17ea6fd0")
 
 DEPENDS=(
   "cairo" "gst-plugins-base" "gst-plugins-bad"
-  "gtk4" "gtk3" "icu" "lcms2" "libgudev" "libsecret"
+  "gtk4" "icu" "lcms2" "libgudev" "libsecret"
   "libsoup" "libtasn1" "mesa" "openjpeg"
   "sqlite" "unifdef" "which" "wpebackend-fdo"
   "bubblewrap" "enchant" "geoclue" "libwebp"
   "hicolor-icon-theme" "libavif" "xdg-dbus-proxy"
-  "harfbuzz" "woff2" "libwpe" "gtk4"
+  "harfbuzz" "woff2" "libwpe"
 )
 BUILD=(
   "cmake" "gobject-introspection" "glib"
@@ -26,6 +26,11 @@ PACKAGE() {
   mkdir -pv build
   cd        build
 
+  # prevent optimization issues
+  CFLAGS="$(echo "${CFLAGS}" | sed 's/-O3/-O1/g' | sed 's/-O2/-O1/g')"
+  CXXFLAGS="$(echo "${CXXFLAGS}" | sed 's/-O3/-O1/g' | sed 's/-O2/-O1/g')"
+  CPPFLAGS="$(echo "${CPPFLAGS}" | sed 's/-O3/-O1/g' | sed 's/-O2/-O1/g')"
+
   cmake -DCMAKE_BUILD_TYPE=Release   \
       -DCMAKE_INSTALL_PREFIX=/usr    \
       -DCMAKE_SKIP_RPATH=ON          \
diff --git a/src/xinit/pkg.sh b/src/xinit/pkg.sh
index 51d5641..a14695d 100644
--- a/src/xinit/pkg.sh
+++ b/src/xinit/pkg.sh
@@ -1,7 +1,7 @@
 NAME="xinit"
 DESC="Usable script to start the xserver"
 VERSION="1.4.2"
-FILES=("https://www.x.org/pub/individual/app/xinit-$VERSION.tar.xz")
+FILES=("https://www.x.org/pub/individual/app/xinit-${VERSION}.tar.xz")
 HASHES=("0e9a1b9a82b84ab229c709c0f939c113")
 DEPENDS=(
   "libx11" "xauth"
@@ -9,14 +9,19 @@ DEPENDS=(
 )
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
 
-  ./configure $XORG_CONFIG --with-xinitdir=/etc/X11/app-defaults
-  make && make DESTDIR=${ROOTDIR} install && ldconfig
+  ./configure $XORG_CONFIG --with-xinitdir="/etc/X11/app-defaults"
+  make
+  make DESTDIR="${ROOTDIR}" install
 
   sed -i '175s/.*/    xserverauthfile=`mktemp -p \/tmp serverauth.XXXXXXXXXX`/' \
-      "$ROOTDIR/usr/bin/startx"
+      "${ROOTDIR}/usr/bin/startx"
 
-  cd .. && rm -rf $NAME-$VERSION
+  cd .. && rm -rf "${NAME}-${VERSION}"
+}
+
+INSTALL() {
+  ldconfig
 }