diff --git a/packages/games/emulators/dolphinsa/package.mk b/packages/games/emulators/dolphinsa/package.mk
index ff50b8c69..5a15a1421 100755
--- a/packages/games/emulators/dolphinsa/package.mk
+++ b/packages/games/emulators/dolphinsa/package.mk
@@ -4,10 +4,9 @@
 PKG_NAME="dolphinsa"
 PKG_VERSION="0b160db48796f727311cea16072174d96b784f80"
 PKG_GIT_CLONE_BRANCH="egldrm"
-PKG_ARCH="aarch64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/rtissera/dolphin"
-PKG_URL="$PKG_SITE.git"
+PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb"
 PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC with improvements. "
 
@@ -25,13 +24,13 @@ PKG_CMAKE_OPTS_TARGET=" -DENABLE_HEADLESS=ON \
                         -DENCODE_FRAMEDUMPS=OFF"
 
 makeinstall_target() {
-mkdir -p $INSTALL/usr/bin
-cp -rf $PKG_BUILD/.${TARGET_NAME}/Binaries/dolphin* $INSTALL/usr/bin
-cp -rf $PKG_DIR/scripts/* $INSTALL/usr/bin
+mkdir -p ${INSTALL}/usr/bin
+cp -rf ${PKG_BUILD}/.${TARGET_NAME}/Binaries/dolphin* ${INSTALL}/usr/bin
+cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
 
-chmod +x ${INSTALL}/usr/bin/dolphin.sh
+chmod +x ${INSTALL}/usr/bin/start_dolphin.sh
 
-mkdir -p $INSTALL/usr/config/dolphin-emu
-cp -rf $PKG_BUILD/Data/Sys/* $INSTALL/usr/config/dolphin-emu
-cp -rf $PKG_DIR/config/* $INSTALL/usr/config/dolphin-emu
+mkdir -p ${INSTALL}/usr/config/dolphin-emu
+cp -rf ${PKG_BUILD}/Data/Sys/* ${INSTALL}/usr/config/dolphin-emu
+cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/dolphin-emu
 }
diff --git a/packages/games/emulators/dolphinsa/scripts/dolphin.sh b/packages/games/emulators/dolphinsa/scripts/start_dolphin.sh
old mode 100644
new mode 100755
similarity index 100%
rename from packages/games/emulators/dolphinsa/scripts/dolphin.sh
rename to packages/games/emulators/dolphinsa/scripts/start_dolphin.sh
diff --git a/packages/games/emulators/duckstationsa/package.mk b/packages/games/emulators/duckstationsa/package.mk
index 03df0d9a6..526f6ad18 100644
--- a/packages/games/emulators/duckstationsa/package.mk
+++ b/packages/games/emulators/duckstationsa/package.mk
@@ -49,10 +49,11 @@ makeinstall_target() {
   rm -rf ${INSTALL}/usr/config/duckstation/duckstation-nogui
   rm -rf ${INSTALL}/usr/config/duckstation/common-tests
 
-  chmod +x ${INSTALL}/usr/bin/duckstation.sh
+  chmod +x ${INSTALL}/usr/bin/start_duckstation.sh
 
- if [[ "${DEVICE}" != RG552 ]]
-  then
-    sed -i '/Rotate = 1/d' ${INSTALL}/usr/config/duckstation/settings.ini
- fi
+  case ${DEVICE} in
+    RG552|handheld)
+      sed -i '/Rotate = 1/d' ${INSTALL}/usr/config/duckstation/settings.ini
+    ;;
+  esac
 }
diff --git a/packages/games/emulators/duckstationsa/scripts/duckstation.sh b/packages/games/emulators/duckstationsa/scripts/start_duckstation.sh
similarity index 100%
rename from packages/games/emulators/duckstationsa/scripts/duckstation.sh
rename to packages/games/emulators/duckstationsa/scripts/start_duckstation.sh
diff --git a/packages/jelos/sources/scripts/runemu.sh b/packages/jelos/sources/scripts/runemu.sh
index 4f7dd9b0f..d4d3989a3 100755
--- a/packages/jelos/sources/scripts/runemu.sh
+++ b/packages/jelos/sources/scripts/runemu.sh
@@ -283,13 +283,13 @@ then
 		"psx")
                         jslisten set "duckstationsa"
 		        if [ "$EMU" = "duckstationsa" ]; then
-            		RUNTHIS='${TBASH} /usr/bin/duckstation.sh "${ROMNAME}"'
+            		RUNTHIS='${TBASH} /usr/bin/start_duckstation.sh "${ROMNAME}"'
         		fi
                 ;;
                 "gamecube")
                         jslisten set "dolphinsa"
                         if [ "$EMU" = "dolphinsa" ]; then
-                        RUNTHIS='${TBASH} /usr/bin/dolphin.sh "${ROMNAME}"'
+                        RUNTHIS='${TBASH} /usr/bin/start_dolphin.sh "${ROMNAME}"'
                         fi
 
 ;;
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index 511314a6f..8e27fd5e7 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -38,7 +38,7 @@ case "${DEVICE}" in
   RG552)
     PKG_DEPENDS_TARGET+=" duckstationsa"
   ;;
-  RG503|RG353P)
+  RG503|RG353P|handheld)
     PKG_DEPENDS_TARGET+=" duckstationsa dolphinsa"
   ;;
 esac