diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 94f9b760352d..89a5299c4c67 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -175,6 +175,8 @@ platform_specific() {
         echo "hugepages=128" >> /tmp/append
     fi
     if [ "$platform" = "rook" ]; then
+        echo "iommu=on intel_iommu=on tsc=reliable pcie_ports=native" >>/tmp/append
+        echo "rhash_entries=1 usb-storage.delay_use=0" >>/tmp/append
         if [ -x /bin/readprefdl ]; then
            readprefdl -f /tmp/.system-prefdl -d > /mnt/flash/.system-prefdl
         elif [ -f /etc/prefdl ]; then
diff --git a/files/initramfs-tools/arista-convertfs.j2 b/files/initramfs-tools/arista-convertfs.j2
index cd3b381aa276..81de6750837a 100644
--- a/files/initramfs-tools/arista-convertfs.j2
+++ b/files/initramfs-tools/arista-convertfs.j2
@@ -41,6 +41,9 @@ get_flash_dev() {
 wait_for_root_dev() {
     local try_rounds=30
     while [ $try_rounds -gt 0 ]; do
+        if blkid | sed 's/"//g' | grep -q "$root_dev"; then
+            return 0
+        fi
         if [ -e "$root_dev" ]; then
             return 0
         fi