diff --git a/dev/python/py3-markupsafe/ympbuild b/dev/python/py3-markupsafe/ympbuild
index c3eb7b89..402c493a 100644
--- a/dev/python/py3-markupsafe/ympbuild
+++ b/dev/python/py3-markupsafe/ympbuild
@@ -11,7 +11,7 @@ source=('https://files.pythonhosted.org/packages/95/7e/68018b70268fb4a2a605e2be4
 depends=(python)
 makedepends=()
 md5sums=('02f337b98aef11bd0fee9c5ae860173b')
-group=()
+group=(dev.python)
 uses=()
 arch=('x86_64')
 
diff --git a/dev/python/setuptools/ympbuild b/dev/python/py3-setuptools/ympbuild
similarity index 93%
rename from dev/python/setuptools/ympbuild
rename to dev/python/py3-setuptools/ympbuild
index 4bfdbf2f..f43fe737 100644
--- a/dev/python/setuptools/ympbuild
+++ b/dev/python/py3-setuptools/ympbuild
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-name='setuptools'
+name='py3-setuptools'
 release='1'
 version='65.6.3'
 url='https://pypi.org/project/setuptools/'
@@ -15,7 +15,7 @@ uses=()
 group=(dev.python)
 arch=('x86_64')
 
-cd $name-$version
+cd setuptools-$version
 
 build(){
     python3 setup.py build
diff --git a/dev/util/meson/ympbuild b/dev/util/meson/ympbuild
index 7d919dea..6015a12d 100644
--- a/dev/util/meson/ympbuild
+++ b/dev/util/meson/ympbuild
@@ -8,7 +8,7 @@ email='aliriza.keskin@pardus.org.tr'
 maintainer='aliriza'
 license=('GPLv3')
 source=("https://github.com/mesonbuild/meson/releases/download/$version/meson-$version.tar.gz")
-depends=(python setuptools)
+depends=(python py3-setuptools)
 makedepends=( )
 md5sums=('9f260adfcbc66ed2e15047c6eb98e503')
 uses=()
@@ -29,6 +29,6 @@ package(){
     install -Dt "${DESTDIR}/usr/share/bash-completion/completions" -m644 data/shell-completions/bash/*
     install -Dt "${DESTDIR}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/*
     # fix hardcoded interpreter location
-    sed -i "1s|.*|#!/usr/bin/env python3|g" "${DESTDIR}/usr/bin/meson"
+    sed -i "1s|.*|#!/usr/bin/python3|g" "${DESTDIR}/usr/bin/meson"
 }
 
diff --git a/media/libs/mesa/ympbuild b/media/libs/mesa/ympbuild
index 40597aa6..5fd82cee 100644
--- a/media/libs/mesa/ympbuild
+++ b/media/libs/mesa/ympbuild
@@ -8,7 +8,7 @@ email='aliriza.keskin@pardus.org.tr'
 maintainer='aliriza'
 license=('GPLv3')
 source=("https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-$version/mesa-mesa-$version.tar.gz")
-depends=(libva libvdpau libdrm llvm glslang)
+depends=(libva libvdpau libdrm llvm glslang elfutils)
 makedepends=(git)
 md5sums=('ed193340000a3f32946d490ea53aaddd')
 group=(media.libs)
diff --git a/x11/base/xcb-proto/ympbuild b/x11/base/xcb-proto/ympbuild
index abece4c1..241d6ba3 100644
--- a/x11/base/xcb-proto/ympbuild
+++ b/x11/base/xcb-proto/ympbuild
@@ -19,7 +19,9 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64
+        --libdir=/usr/lib64 \
+        --with-python_prefix=/usr/lib64/python3 \
+        --with-python_exec_prefix=/usr/lib64/python3
 }
 
 build(){
@@ -28,4 +30,7 @@ build(){
 
 package(){
     make install -j`nproc`
+    # Move files
+    mv ${DESTDIR}/usr/lib64/python3/lib/python*/site-packages/xcbgen ${DESTDIR}/usr/lib64/python3/xcbgen
+    rm -rf ${DESTDIR}/usr/lib64/python3/lib
 }