diff --git a/source/classes/constants.py b/source/classes/constants.py
index 90434970..36bf0ec2 100644
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -33,7 +33,7 @@ CUSTOMITEMLABELS = [
   "Ocarina", "Bug Catching Net", "Book of Mudora", "Bottle", "Cane of Somaria",
   "Cane of Byrna", "Magic Cape", "Magic Mirror", "Pegasus Boots", "Power Glove",
   "Titans Mitts", "Progressive Glove", "Flippers", "Moon Pearl", "Piece of Heart",
-  
+
   "Boss Heart Container", "Sanctuary Heart Container", "Fighter Sword", "Master Sword", "Tempered Sword",
   "Golden Sword", "Progressive Sword", "Blue Shield", "Red Shield", "Mirror Shield",
   "Progressive Shield", "Blue Mail", "Red Mail", "Progressive Armor", "Magic Upgrade (1/2)",
@@ -102,7 +102,8 @@ SETTINGSTOPROCESS = {
       "spoiler": "create_spoiler",
       "suppressrom": "suppress_rom",
       "usestartinventory": "usestartinventory",
-      "usecustompool": "custom"
-    } 
+      "usecustompool": "custom",
+      "saveonexit": "saveonexit"
+    }
   }
 }
diff --git a/source/gui/loadcliargs.py b/source/gui/loadcliargs.py
index 462c5de6..b62f5065 100644
--- a/source/gui/loadcliargs.py
+++ b/source/gui/loadcliargs.py
@@ -1,6 +1,6 @@
 from source.classes.SpriteSelector import SpriteSelector as spriteSelector
 from source.gui.randomize.gameoptions import set_sprite
-from Rom import Sprite
+from Rom import Sprite, get_sprite_from_name
 import source.classes.constants as CONST
 
 def loadcliargs(gui, args, settings=None):
@@ -39,18 +39,16 @@ def loadcliargs(gui, args, settings=None):
         def sprite_setter(spriteObject):
             gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"] = spriteObject
         if args["sprite"] is not None:
-            sprite_obj = args.sprite if isinstance(args["sprite"], Sprite) else Sprite(args["sprite"])
-            r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False
-            set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter,
+            sprite_obj = args.sprite if isinstance(args["sprite"], Sprite) else get_sprite_from_name(args["sprite"])
+            set_sprite(sprite_obj, False, spriteSetter=sprite_setter,
                        spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"],
                        randomSpriteVar=gui.randomSprite)
 
         def sprite_setter_adj(spriteObject):
             gui.pages["adjust"].content.sprite = spriteObject
         if args["sprite"] is not None:
-            sprite_obj = args.sprite if isinstance(args.sprite, Sprite) else Sprite(args.sprite)
-            r_sprite_flag = args["randomSprite"] if hasattr(args, 'randomSprite') else False
-            set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter_adj,
+            sprite_obj = args.sprite if isinstance(args["sprite"], Sprite) else get_sprite_from_name(args["sprite"])
+            set_sprite(sprite_obj, False, spriteSetter=sprite_setter_adj,
                        spriteNameVar=gui.pages["adjust"].content.spriteNameVar2,
                        randomSpriteVar=gui.randomSprite)