diff --git a/Build Linux b/Build Linux
index 512aa982..af01c928 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -190,9 +190,9 @@ function update_live_env() {
     
     # Live packages
     while read -r p; do
-        sed -i "/$p/d" "$LIVE_DIR/packages.both"
+        sed -i "/$p/d" "$LIVE_DIR/packages.x86_64"
     done < "$ROOT_DIR/.linux_items/packages/live_remove"
-    cat "$ROOT_DIR/.linux_items/packages/live_add" >> "$LIVE_DIR/packages.both"
+    cat "$ROOT_DIR/.linux_items/packages/live_add" >> "$LIVE_DIR/packages.x86_64"
     echo "[custom]" >> "$LIVE_DIR/pacman.conf"
     echo "SigLevel = Optional TrustAll" >> "$LIVE_DIR/pacman.conf"
     echo "Server = file://$REPO_DIR" >> "$LIVE_DIR/pacman.conf"
@@ -229,7 +229,7 @@ function update_live_env() {
     ssh-keygen -b 4096 -C "$username@$hostname" -N "" -f "$SKEL_DIR/.ssh/id_rsa"
     echo 'rm /root/.ssh/id*' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     echo 'rm /root/.zlogin' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
-    sed -i -r 's/^(.*PermitRootLogin.*)$/PermitRootLogin no/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    sed -r '/.*PermitRootLogin.*/d' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     cp "$ROOT_DIR/.linux_items/authorized_keys" "$SKEL_DIR/.ssh/authorized_keys"
     
     # Root user
@@ -326,9 +326,11 @@ function build_iso() {
 
     # Removing cached (and possibly outdated) custom repo packages
     for package in $(cat "$ROOT_DIR/.linux_items/packages/aur"); do
-        if [[ -f /var/cache/pacman/pkg/${package}* ]]; then
-            rm /var/cache/pacman/pkg/${package}*
-        fi
+        for p in /var/cache/pacman/pkg/*${package}*; do
+            if [[ -f "${p}" ]]; then
+                rm "${p}"
+            fi
+        done
     done
     
     # Build ISO