diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 35ca09cd..b00495dc 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -246,19 +246,14 @@ void
 cAudioManager::ProcessReverb()
 {
 #ifdef AUDIO_REVERB
-#ifdef FIX_BUGS
-	const uint32 numChannels = NUM_CHANNELS_GENERIC;
-#else
-	const uint32 numChannels = NUM_CHANNELS_GENERIC+1;
-#endif
-
 	if (SampleManager.UpdateReverb() && m_bDynamicAcousticModelingStatus) {
-#ifndef GTA_PS2
-		for (uint32 i = 0; i < numChannels; i++) {
+#ifdef FIX_BUGS
+		for (uint32 i = 0; i < NUM_CHANNELS_GENERIC; i++)
+#else
+		for (uint32 i = 0; i < NUM_CHANNELS_GENERIC + 1; i++)
+#endif
 			if (m_asActiveSamples[i].m_bReverb)
 				SampleManager.SetChannelReverbFlag(i, TRUE);
-		}
-#endif
 	}
 #endif // AUDIO_REVERB
 }
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 51f1946f..17cd3d28 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -11,6 +11,13 @@
 #include "Camera.h"
 #include "World.h"
 #include "ZoneCull.h"
+#include "debugmenu.h"
+
+#ifdef DEBUGMENU
+SETTWEAKPATH("Audio");
+TWEAKBOOLN(AudioManager.m_bIsSurround, "Surround/Reverb");
+TWEAKBOOLN(AudioManager.m_bDoubleVolume, "Double volume");
+#endif
 
 cAudioManager AudioManager;
 
@@ -583,7 +590,7 @@ cAudioManager::ServiceSoundEffects()
 	AdjustSamplesVolume();
 #endif
 	ProcessActiveQueues();
-#ifdef AUDIO_OAL
+#ifndef AUDIO_MSS
 	SampleManager.Service();
 #endif
 	for (int32 i = 0; i < m_sAudioScriptObjectManager.m_nScriptObjectEntityTotal; i++) {
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index e7e6dfb0..97f5d978 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -7,11 +7,15 @@
 #define MAX_FREQ DIGITALRATE
 
 struct tSample {
+#ifndef GTA_PS2
 	uint32 nOffset;
+#endif
 	uint32 nSize;
 	uint32 nFrequency;
+#ifndef GTA_PS2
 	uint32 nLoopStart;
 	int32 nLoopEnd;
+#endif
 };
 
 #ifdef GTA_PS2
@@ -149,15 +153,19 @@ class cSampleManager
 	uint8   m_nEffectsFadeVolume;
 	uint8   m_nMusicFadeVolume;
 	bool8   m_nMonoMode;
+#ifdef GTA_PC
 	char    m_szCDRomRootPath[80];
 	bool8   m_bInitialised;
 	uint8   m_nNumberOfProviders;
 	char   *m_aAudioProviders[MAXPROVIDERS];
+#endif
 	tSample m_aSamples[TOTAL_AUDIO_SAMPLES];
+#ifdef GTA_PC
 	char    m_MiscomPath[260];
 	char    m_WavFilesPath[260];
 	char    m_MP3FilesPath[188];
-	void   *m_aChannels[18];
+	void   *m_aChannels[18]; // what's this?
+#endif
 
 public:
 	
@@ -250,7 +258,7 @@ public:
 	int32 GetStreamedFileLength                                                (uint8 nStream = 0);
 	bool8 IsStreamPlaying                                                      (uint8 nStream = 0);
 	void  SetStreamedFileLoopFlag                             (bool8 nLoopFlag, uint8 nStream = 0);
-#ifdef AUDIO_OAL
+#ifndef AUDIO_MSS
 	void  Service(void);
 #endif
 	bool8 InitialiseSampleBanks(void);
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index 2e6c628d..3c016fbf 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -383,6 +383,11 @@ cSampleManager::IsStreamPlaying(uint8 nStream)
 	return FALSE;
 }
 
+void
+cSampleManager::Service(void)
+{
+}
+
 bool8
 cSampleManager::InitialiseSampleBanks(void)
 {
diff --git a/src/extras/debugmenu.h b/src/extras/debugmenu.h
index 201c6040..a160c060 100644
--- a/src/extras/debugmenu.h
+++ b/src/extras/debugmenu.h
@@ -8,8 +8,8 @@
 #define SETTWEAKPATH(path)	                        static const char *___tw___TWEAKPATH = path;
 #define TWEAKFUNC(v)                                static CTweakFunc   CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), TWEAKPATH);
 #define TWEAKFUNCN(v, name)                         static CTweakFunc   CONCAT(___tw___tweak, __COUNTER__)(&v, name, TWEAKPATH);
-#define TWEAKBOOL(v)                                static CTweakBool   CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), TWEAKPATH);
-#define TWEAKBOOLN(v, name)                         static CTweakBool   CONCAT(___tw___tweak, __COUNTER__)(&v, name, TWEAKPATH);
+#define TWEAKBOOL(v)                                static CTweakBool   CONCAT(___tw___tweak, __COUNTER__)((bool*)&v, STR(v), TWEAKPATH);
+#define TWEAKBOOLN(v, name)                         static CTweakBool   CONCAT(___tw___tweak, __COUNTER__)((bool*)&v, name, TWEAKPATH);
 #define TWEAKINT32(v, lower, upper, step)           static CTweakInt32  CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
 #define TWEAKINT32N(v, lower, upper, step, name)    static CTweakInt32  CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
 #define TWEAKUINT32(v, lower, upper, step)          static CTweakUInt32 CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
diff --git a/src/text/Messages.cpp b/src/text/Messages.cpp
index 8a072da9..9f6e90d0 100644
--- a/src/text/Messages.cpp
+++ b/src/text/Messages.cpp
@@ -444,7 +444,7 @@ CMessages::InsertStringInString(wchar *str1, wchar *str2)
 void
 CMessages::InsertPlayerControlKeysInString(wchar *str)
 {
-#ifdef GTA_PC_CONROLS
+#ifdef GTA_PC_CONTROLS
 	uint16 i;
 	wchar outstr[256];
 	wchar keybuf[256];