diff --git a/lib/libcoolstream2/audio_cs.h b/lib/libcoolstream2/audio_cs.h
index 0574eb588..77ff55715 100644
--- a/lib/libcoolstream2/audio_cs.h
+++ b/lib/libcoolstream2/audio_cs.h
@@ -116,8 +116,8 @@ public:
 
 	void *GetHandle(void);
 	void *GetDSP(void);
-	void HandleAudioMessage(int Event, void *pData);
-	void HandlePcmMessage(int Event, void *pData);
+	void HandleAudioMessage(void *Handle, int Event, void *pData);
+	void HandlePcmMessage(void *Handle, int Event, void *pData);
 	/* shut up */
 	int mute(void);
 	int unmute(void);
diff --git a/lib/libcoolstream2/ca_cs.h b/lib/libcoolstream2/ca_cs.h
index ffb92dfac..3618281ef 100644
--- a/lib/libcoolstream2/ca_cs.h
+++ b/lib/libcoolstream2/ca_cs.h
@@ -11,6 +11,7 @@
 #define __CA_CS_H_
 
 #include <OpenThreads/Thread>
+#include <OpenThreads/Mutex>
 #include <vector>
 #include "cs_types.h"
 
@@ -114,6 +115,7 @@ class cCA : public OpenThreads::Thread {
 private:
 	/// Static instance of the CA module
 	static cCA *inst;
+	static OpenThreads::Mutex lock;
 	/// Private constructor (singleton method)
 	cCA(void);
 	/// Private data for the CA module
@@ -160,7 +162,7 @@ public:
 	/// Notify the module with our answer (choice nr)
 	void MenuAnswer(enum CA_SLOT_TYPE, u32 Slot, u32 choice);
 	/// Notify the module with our answer (binary)
-	void InputAnswer(enum CA_SLOT_TYPE, u32 Slot, u8 * Data, int Len);
+	void InputAnswer(enum CA_SLOT_TYPE, u32 Slot, u8 * Data, int Len, bool Cancelled = false);
 	/// Notify the module we closed the menu
 	void MenuClose(enum CA_SLOT_TYPE, u32 Slot);
 	/// Get the supported CAIDs