diff --git a/src/display.sh b/src/display.sh
index abe7509..ecfb4e4 100644
--- a/src/display.sh
+++ b/src/display.sh
@@ -6,10 +6,10 @@ set -Eeuo pipefail
 : "${VGA:=""}"              # VGA adaptor
 : "${DISPLAY:="web"}"       # Display type
 
-if [[ "${BOOT_MODE,,}" == "windows" ]]; then
-  [ -z "$VGA" ] && VGA="ramfb"
-else
+if [[ "${BOOT_MODE,,}" != "windows" ]]; then
   [ -z "$VGA" ] && VGA="virtio-gpu"
+else
+  [ -z "$VGA" ] && VGA="ramfb -device virtio-gpu"
 fi
 
 case "${DISPLAY,,}" in
diff --git a/src/proc.sh b/src/proc.sh
index c124f69..7bd5741 100644
--- a/src/proc.sh
+++ b/src/proc.sh
@@ -33,12 +33,8 @@ fi
 
 if [[ "$KVM" != [Nn]* ]]; then
 
-  WIN_FEATURES=""
   CPU_FEATURES=""
-  KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"
-
-  #CPU_FEATURES="kvm=on,l3-cache=on"
-  #WIN_FEATURES="+hypervisor,+invtsc,hv_passthrough"
+  KVM_OPTS=",accel=kvm -enable-kvm"
 
   if [ -z "$CPU_MODEL" ]; then
     CPU_MODEL="host"
@@ -47,7 +43,6 @@ if [[ "$KVM" != [Nn]* ]]; then
 else
 
   CPU_FEATURES=""
-  WIN_FEATURES=""
   KVM_OPTS=" -accel tcg,thread=multi"
 
   if [ -z "$CPU_MODEL" ]; then
@@ -64,13 +59,6 @@ else
 
 fi
 
-if [[ "${BOOT_MODE,,}" == "windows" ]]; then
-
-  [ -n "$CPU_FEATURES" ] && CPU_FEATURES="$CPU_FEATURES,"
-  CPU_FEATURES="$CPU_FEATURES${WIN_FEATURES}"
-
-fi
-
 if [ -z "$CPU_FLAGS" ]; then
   if [ -z "$CPU_FEATURES" ]; then
     CPU_FLAGS="$CPU_MODEL"