diff --git a/firmware/SOURCES b/firmware/SOURCES
index 9fa380a99a..5afd46954d 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -165,7 +165,7 @@ target/hosted/agptek/rocker_codec.c
 target/hosted/surfans/button-f28.c
 target/hosted/surfans/debug-f28.c
 target/hosted/surfans/powermgmt-f28.c
-target/hosted/surfanslinux_codec.c
+target/hosted/surfans/surfanslinux_codec.c
 #endif
 
 #if (defined(XDUOO_X3II) || defined(XDUOO_X20)) && !defined(SIMULATOR)
@@ -180,7 +180,7 @@ target/hosted/usb-hiby.c
 target/hosted/button-devinput.c
 #endif
 
-#if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)
+#if defined(FIIO_M3K_LINUX) && !defined(SIMULATOR)
 target/hosted/fiio/buttonlight-fiio.c
 target/hosted/fiio/button-fiio.c
 target/hosted/fiio/debug-fiio.c
@@ -558,17 +558,17 @@ drivers/audio/es9018.c
 drivers/audio/es9218.c
 #endif /* defined(HAVE_*) */
 #else /* PLATFORM_HOSTED */
-#if defined(HAVE_AS3514)
-drivers/audio/as3514.c
-#elif defined(HAVE_WM8978)
-drivers/audio/wm8978.c
-#elif defined(HAVE_SDL_AUDIO)
+#if defined(HAVE_SDL_AUDIO) || defined(SIMULATOR)
 drivers/audio/sdl.c
 #if (CONFIG_PLATFORM & PLATFORM_MAEMO5)
 target/hosted/maemo/pcm-gstreamer.c
 #else
 target/hosted/sdl/pcm-sdl.c
 #endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */
+#elif defined(SAMSUNG_YPR0) && defined(HAVE_AS3514)
+drivers/audio/as3514.c
+#elif defined(SAMSUNG_YPR1) && defined(HAVE_WM8978)
+drivers/audio/wm8978.c
 #elif defined(CTRU)
 drivers/audio/ctru.c
 #endif
diff --git a/firmware/target/hosted/android/android_codec.h b/firmware/target/hosted/android/android_codec.h
index a68faae848..838df9ceda 100644
--- a/firmware/target/hosted/android/android_codec.h
+++ b/firmware/target/hosted/android/android_codec.h
@@ -21,6 +21,8 @@
 #ifndef __ANDROID_CODEC_H
 #define __ANDROID_CODEC_H
 
+#define AUDIOHW_HAVE_MONO_VOLUME
+
 /* Bass and treble tone controls */
 #ifdef AUDIOHW_HAVE_BASS
 AUDIOHW_SETTING(BASS,        "dB",   0,  1, -24,  24,   0)
diff --git a/firmware/target/hosted/surfans/surfanslinux_codec.h b/firmware/target/hosted/surfans/surfanslinux_codec.h
index 548f34cdd4..35d44a4ab7 100644
--- a/firmware/target/hosted/surfans/surfanslinux_codec.h
+++ b/firmware/target/hosted/surfans/surfanslinux_codec.h
@@ -3,7 +3,6 @@
 
 #define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP)
 AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -102*10,  0, -30*10)
-#endif
 
 //#define AUDIOHW_MUTE_ON_STOP
 #define AUDIOHW_MUTE_ON_SRATE_CHANGE
@@ -15,3 +14,5 @@ AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0)
 void audiohw_mute(int mute);
 void surfans_set_output(int ps);
 int surfans_get_outputs(void);
+
+#endif /* __SURFANSLINUX__CODEC__ */