diff --git a/core/tremor/misc.h b/core/tremor/misc.h
index cb6dfcc..03640e2 100644
--- a/core/tremor/misc.h
+++ b/core/tremor/misc.h
@@ -37,23 +37,6 @@
 #include <sys/types.h>
 #endif
 
-#if !defined(__LIBRETRO__) && defined(GEKKO)
-#ifndef __CELLOS_LV2__
-#ifndef _XBOX360
-#if BYTE_ORDER==LITTLE_ENDIAN
-union magic {
-  struct {
-    ogg_int32_t lo;
-    ogg_int32_t hi;
-  } halves;
-  ogg_int64_t whole;
-};
-#endif
-#endif
-#endif
-#endif
-
-#ifndef ANDROID
 #if BYTE_ORDER==BIG_ENDIAN
 union magic {
   struct {
@@ -62,7 +45,14 @@ union magic {
   } halves;
   ogg_int64_t whole;
 };
-#endif
+#elif BYTE_ORDER==LITTLE_ENDIAN
+union magic {
+  struct {
+    ogg_int32_t lo;
+    ogg_int32_t hi;
+  } halves;
+  ogg_int64_t whole;
+};
 #endif
 
 STIN ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
diff --git a/libretro/libretro.c b/libretro/libretro.c
index e4bb026..0b34067 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -855,7 +855,7 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
       case RETRO_DEVICE_SMSPAD_4P:
          config.input[port].padtype = DEVICE_PAD2B;
          input.dev[port] = DEVICE_PAD2B;
-         input.system[0] = SYSTEM_MS4PLAY;
+         input.system[0] = SYSTEM_MASTERTAP;
          break;
       case RETRO_DEVICE_JOYPAD:
       default: