diff --git a/quickemu b/quickemu
index 0ae7e31..80578be 100755
--- a/quickemu
+++ b/quickemu
@@ -488,6 +488,7 @@ function vm_boot() {
 
       if [[ "${guest_os}" == *"solaris" ]]; then
         MACHINE_TYPE="pc"
+        USB_CONTROLLER="xhci"
       fi
 
       if [ -z "${disk_size}" ]; then
diff --git a/quickget b/quickget
index 65f148b..cf76a3f 100755
--- a/quickget
+++ b/quickget
@@ -885,7 +885,10 @@ EOF
 
         # OS specific tweaks
         case ${OS} in
-          alma|centos-stream|endless|nixos|oraclelinux|popos|rockylinux|openindiana)
+          alma|centos-stream|endless|nixos|oraclelinux|popos|rockylinux)
+            echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
+          openindiana)
+            echo "boot=\"legacy\"" >> "${CONF_FILE}"
             echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
           batocera)
             echo "disk_size=\"8G\"" >> "${CONF_FILE}";;