diff --git a/data/GameManager.js b/data/GameManager.js
index f0c61f0..4046c0e 100644
--- a/data/GameManager.js
+++ b/data/GameManager.js
@@ -12,7 +12,7 @@ class EJS_GameManager {
             simulateInput: this.Module.cwrap('simulate_input', 'null', ['number', 'number', 'number']),
             toggleMainLoop: this.Module.cwrap('toggleMainLoop', 'null', ['number']),
             getCoreOptions: this.Module.cwrap('get_core_options', 'string', []),
-            setVariable: this.Module.cwrap('set_variable', 'null', ['string', 'string']),
+            setVariable: this.Module.cwrap('ejs_set_variable', 'null', ['string', 'string']),
             setCheat: this.Module.cwrap('set_cheat', 'null', ['number', 'number', 'string']),
             resetCheat: this.Module.cwrap('reset_cheat', 'null', []),
             toggleShader: this.Module.cwrap('shader_enable', 'null', ['number']),
@@ -23,7 +23,6 @@ class EJS_GameManager {
             saveSaveFiles: this.Module.cwrap('cmd_savefiles', '', []),
             supportsStates: this.Module.cwrap('supports_states', 'number', []),
             loadSaveFiles: this.Module.cwrap('refresh_save_files', 'null', []),
-            setVolume: this.Module.cwrap('set_volume', 'null', ['number']),
             toggleFastForward: this.Module.cwrap('toggle_fastforward', 'null', ['number']),
             setFastForwardRatio: this.Module.cwrap('set_ff_ratio', 'null', ['number']),
             toggleRewind: this.Module.cwrap('toggle_rewind', 'null', ['number']),
diff --git a/data/emulator.js b/data/emulator.js
index 408b5ef..16fa0c4 100644
--- a/data/emulator.js
+++ b/data/emulator.js
@@ -46,7 +46,9 @@ class EmulatorJS {
                 'snes9x': 'snes',
                 'stella2014': 'atari2600',
                 'virtualjaguar': 'jaguar',
-                'yabause': 'segaSaturn'
+                'yabause': 'segaSaturn',
+                'amiga': 'puae',
+                'vice_x64': 'c64'
             }
             return options[core] || core;
         }
@@ -79,6 +81,8 @@ class EmulatorJS {
             'ngp': 'mednafen_ngp',
             'ws': 'mednafen_wswan',
             'coleco': 'gearcoleco',
+            'puae': 'amiga',
+            'c64': 'vice_x64'
         }
         if (this.isSafari && this.isMobile && this.getCore(true) === "n64") {
             return "parallel_n64";