diff --git a/src/lib/boot.sh b/src/lib/boot.sh
index b2b84b9..3a6be2e 100644
--- a/src/lib/boot.sh
+++ b/src/lib/boot.sh
@@ -217,7 +217,7 @@ EOF
 install_bootloader()
 {
     if ! [[ $ROOT_PART =~ /dev/mapper ]]; then
-        if [[ $BOOTLDR == 'syslinux' && $SYS == 'BIOS' ]]; then
+        if [[ $BOOTLDR == 'syslinux' ]]; then
             ROOT_PART_ID="UUID=$(blkid -s UUID -o value $ROOT_PART)"
         else
             ROOT_PART_ID="UUID=$(blkid -s PARTUUID -o value $ROOT_PART)"
@@ -227,6 +227,9 @@ install_bootloader()
         ROOT_PART_ID="$ROOT_PART"
     fi
 
+    # for virtual machine remove the ucode
+    [[ $VM ]] && UCODE=""
+
     # remove old UEFI boot entries
     if [[ $SYS == 'UEFI' ]]; then
         find ${MNT}${BMNTS[$SYS-$BOOTLDR]}/EFI/ \
diff --git a/src/lib/install.sh b/src/lib/install.sh
index 3ffaca3..b46a166 100644
--- a/src/lib/install.sh
+++ b/src/lib/install.sh
@@ -138,6 +138,7 @@ EOF
     fi
 
     # set the keymaps
+    mkdir -p $MNT/etc/X11/xorg.conf.d
     cat > $MNT/etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
 # Use localectl(1) to instruct systemd-localed to update it.
 Section "InputClass"