diff --git a/src/audio_call.c b/src/audio_call.c
index 277c417..69d5806 100644
--- a/src/audio_call.c
+++ b/src/audio_call.c
@@ -145,7 +145,7 @@ ToxAv *init_audio(ToxWindow *self, Tox *tox)
     toxav_register_callstate_callback(ASettins.av, callback_peer_timeout, av_OnPeerTimeout, self);
     //toxav_register_callstate_callback(ASettins.av, callback_media_change, av_OnMediaChange, self);
     
-    toxav_register_audio_callback(write_device_callback, NULL);
+    toxav_register_audio_callback(ASettins.av, write_device_callback, NULL);
 
     return ASettins.av;
 }
@@ -378,7 +378,7 @@ void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
     ToxAvError error = toxav_call(ASettins.av, &self->call_idx, self->num, &ASettins.cs, 30);
 
     if ( error != av_ErrorNone ) {
-        if ( error == av_ErrorAlreadyInCall ) error_str = "Already in a call!";
+        if ( error == av_ErrorAlreadyInCallWithPeer ) error_str = "Already in a call!";
         else error_str = "Internal error!";
 
         goto on_error;
diff --git a/src/device.c b/src/device.c
index c07b355..3842df2 100644
--- a/src/device.c
+++ b/src/device.c
@@ -431,12 +431,10 @@ void* thread_poll (void* arg) // TODO: maybe use thread for every input source
                     int16_t frame[16000];
                     alcCaptureSamples(device->dhndl, frame, f_size);
                     
-                    if ( device->muted 
-                    #ifdef AUDIO
-                        || (device->enable_VAD && !toxav_has_activity(av, device->call_idx, frame, f_size, device->VAD_treshold))
-                    #endif /* AUDIO */
-                        )
-                        { unlock; continue; } /* Skip if no voice activity */
+                    if (device->muted) { 
+                        unlock;
+                        continue;
+                    }
                     
                     if ( device->cb ) device->cb(frame, f_size, device->cb_data);
                 } 
diff --git a/src/friendlist.c b/src/friendlist.c
index 78d26f5..c1fb756 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -1030,7 +1030,7 @@ static void friendlist_onAv(ToxWindow *self, ToxAv *av, int call_index)
 {
     int id = toxav_get_peer_id(av, call_index, 0);
 
-    if ( id != av_ErrorInternal && id >= Friends.max_idx)
+    if ( id != av_ErrorUnknown && id >= Friends.max_idx)
         return;
 
     Tox *m = toxav_get_tox(av);