diff --git a/etc/cron.daily/40-autodist-cleanold b/etc/cron.daily/40-autodist-cleanold
index 86edf28..5b8063d 100755
--- a/etc/cron.daily/40-autodist-cleanold
+++ b/etc/cron.daily/40-autodist-cleanold
@@ -4,11 +4,11 @@
 function clean() {
    dir=$1
    arch=$2
-   find $dir/RPM/RPMS/$arch/ -maxdepth 1 -ctime +30 -exec rm -rf {} \;
-   find $dir/RPM/RPMS/noarch/ -maxdepth 1 -ctime +30 -exec rm -rf {} \;
-   find $dir/RPM/BUILD/ -maxdepth 1 -ctime +30 -exec rm -rf {} \;
-   find $dir/RPM/SOURCES/ -maxdepth 1 -ctime +120 -exec rm -rf {} \;
-   find $dir/RPM/SRPMS/ -maxdepth 1 -ctime +90 -exec rm -rf {} \;
+   find $dir/RPM/RPMS/$arch/ -maxdepth 1 -ctime +21 -exec rm -rf {} \;
+   find $dir/RPM/RPMS/noarch/ -maxdepth 1 -ctime +21 -exec rm -rf {} \;
+   find $dir/RPM/BUILD/ -maxdepth 1 -ctime +21 -exec rm -rf {} \;
+   find $dir/RPM/SOURCES/ -maxdepth 1 -ctime +120 -a ! -name "*.patch" -exec rm -rf {} \;
+   find $dir/RPM/SRPMS/ -maxdepth 1 -ctime +48 -exec rm -rf {} \;
 }
 
 for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
diff --git a/etc/cron.hourly/60-autodist-update b/etc/cron.hourly/60-autodist-update
index 5380525..8da29d2 100755
--- a/etc/cron.hourly/60-autodist-update
+++ b/etc/cron.hourly/60-autodist-update
@@ -8,7 +8,7 @@
 
 ME=`basename $0`
 [ "$$" == "`pidof -x $ME`" -o "$$" == "`pidof -x 60-autodist-update`" ] || {
-   echo "Warning: $ME script already running; exiting."
+#   echo "Warning: $ME script already running; exiting."
    exit 0
 }
 
diff --git a/etc/cron.hourly/65-autoport-native b/etc/cron.hourly/65-autoport-native
index 10f0239..1f808b8 100755
--- a/etc/cron.hourly/65-autoport-native
+++ b/etc/cron.hourly/65-autoport-native
@@ -77,7 +77,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
       LANG=C smart update > /dev/null
       LANG=C smart upgrade -y >> $LOGFILE
       echo "= Working on $r($a) in native mode" >> $LOGFILE
-      su -l autodist -c "autoport -b -r $r" >> $LOGFILE
+      su -l ${AUTOPORT_CHROOT_USER[$i]} -c "$CMD_PREFIX autoport -b -r $r" >> $LOGFILE
       cat /var/autodist/.autoport/$a/$r-current.log >> $LOGFILE
    fi