diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h
index c272b934..20efa1d1 100644
--- a/other/apidsl/toxav.in.h
+++ b/other/apidsl/toxav.in.h
@@ -433,12 +433,7 @@ bool call_control (uint32_t friend_number, CALL_CONTROL control) {
  ******************************************************************************/
 namespace bit_rate {
     /**
-     * Set the audio bit rate to be used in subsequent audio frames. If the passed 
-     * bit rate is the same as the current bit rate this function will return true 
-     * without calling a callback. If there is an active non forceful setup with the
-     * passed audio bit rate and the new set request is forceful, the bit rate is 
-     * forcefully set and the previous non forceful request is cancelled. The active
-     * non forceful setup will be canceled in favour of new non forceful setup.
+     * Set the audio bit rate to be used in subsequent audio/video frames.
      *
      * @param friend_number The friend number.
      * @param audio_bit_rate The new audio bit rate in Kb/sec. Set to 0 to disable
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index 232c06de..083f862f 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -18,7 +18,6 @@ libtoxav_la_SOURCES = ../toxav/rtp.h \
                     ../toxav/bwcontroler.c \
                     ../toxav/toxav.h \
                     ../toxav/toxav.c \
-                    ../toxav/toxav_old.h \
                     ../toxav/toxav_old.c
 
 libtoxav_la_CFLAGS = -I../toxcore \
diff --git a/toxav/bwcontroler.c b/toxav/bwcontroler.c
index 2c468ce3..a4328045 100644
--- a/toxav/bwcontroler.c
+++ b/toxav/bwcontroler.c
@@ -200,7 +200,7 @@ int on_update (BWControler *bwc, struct BWCMessage *msg)
 int bwc_handle_data(Messenger* m, uint32_t friendnumber, const uint8_t* data, uint16_t length, void* object)
 {
     if (length != sizeof(struct BWCMessage))
-        return;
+        return -1;
 
     /* NOTE the data is mutable */
     return on_update(object, (struct BWCMessage *) data);
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 4a413b66..7585206c 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -63,7 +63,7 @@ typedef struct ToxAVCall_s {
     struct ToxAVCall_s *next;
 } ToxAVCall;
 
-struct ToxAV_s {
+struct ToxAV {
     Messenger *m;
     MSISession *msi;
 
diff --git a/toxav/toxav.h b/toxav/toxav.h
index befae5dc..d558991f 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -87,7 +87,7 @@ typedef struct Tox Tox;
  */
 #ifndef TOXAV_DEFINED
 #define TOXAV_DEFINED
-typedef struct ToxAV_s ToxAV;
+typedef struct ToxAV ToxAV;
 #endif /* TOXAV_DEFINED */
 
 
@@ -510,12 +510,7 @@ typedef enum TOXAV_ERR_BIT_RATE_SET {
 } TOXAV_ERR_BIT_RATE_SET;
 
 /**
- * Set the audio bit rate to be used in subsequent audio frames. If the passed 
- * bit rate is the same as the current bit rate this function will return true 
- * without calling a callback. If there is an active non forceful setup with the
- * passed audio bit rate and the new set request is forceful, the bit rate is 
- * forcefully set and the previous non forceful request is cancelled. The active
- * non forceful setup will be canceled in favour of new non forceful setup.
+ * Set the audio bit rate to be used in subsequent audio/video frames.
  *
  * @param friend_number The friend number of the friend for which to set the
  * audio bit rate.