diff --git a/misc/qubes_download_dom0_updates.sh b/misc/qubes_download_dom0_updates.sh
index 33bc46d..de869c5 100755
--- a/misc/qubes_download_dom0_updates.sh
+++ b/misc/qubes_download_dom0_updates.sh
@@ -43,6 +43,10 @@ fi
 mkdir -p $DOM0_UPDATES_DIR/etc
 sed -i '/^reposdir\s*=/d' $DOM0_UPDATES_DIR/etc/yum.conf
 
+# Rebuild rpm database in case of different rpm version
+rm -f $DOM0_UPDATES_DIR/var/lib/rpm/__*
+rpm --root=$DOM0_UPDATES_DIR --rebuilddb
+
 if [ "$CLEAN" = "1" ]; then
     yum $OPTS clean all
     rm -f $DOM0_UPDATES_DIR/packages/*
diff --git a/vm-systemd/misc-post.sh b/vm-systemd/misc-post.sh
index dbefd43..b86e6a7 100755
--- a/vm-systemd/misc-post.sh
+++ b/vm-systemd/misc-post.sh
@@ -30,6 +30,11 @@ if [ -e /dev/xvdb ] ; then
 
         touch /var/lib/qubes/first_boot_completed
     fi
+    # Chown home if user UID have changed - can be the case on template switch
+    HOME_USER_UID=`ls -dn /home/user | awk '{print $3}'`
+    if [ "`id -u user`" -ne "$HOME_USER_UID" ]; then
+        find /home/user -uid "$HOME_USER_UID" -print0 | xargs -0 chown user:user
+    fi
 fi
 
 [ -x /rw/config/rc.local ] && /rw/config/rc.local