diff --git a/TMessagesProj/jni/tgnet/Handshake.cpp b/TMessagesProj/jni/tgnet/Handshake.cpp
index 3f4f329ef..a9fd6bf15 100644
--- a/TMessagesProj/jni/tgnet/Handshake.cpp
+++ b/TMessagesProj/jni/tgnet/Handshake.cpp
@@ -895,9 +895,9 @@ void Handshake::processHandshakeResponse(TLObject *message, int64_t messageId) {
 }
 
 void Handshake::sendAckRequest(int64_t messageId) {
-    /*auto msgsAck = new TL_msgs_ack();
+    auto msgsAck = new TL_msgs_ack();
     msgsAck->msg_ids.push_back(messageId);
-    sendRequestData(msgsAck, false);*/
+    sendRequestData(msgsAck, false);
 }
 
 TLObject *Handshake::getCurrentHandshakeRequest() {
diff --git a/TMessagesProj/jni/voip/CMakeLists.txt b/TMessagesProj/jni/voip/CMakeLists.txt
index cc038c4a5..8d04b270b 100644
--- a/TMessagesProj/jni/voip/CMakeLists.txt
+++ b/TMessagesProj/jni/voip/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.6.0)
 
 #libvpx_yasm
-#if (${ANDROID_ABI} STREQUAL "x86" OR ${ANDROID_ABI} STREQUAL "x86_64")
-#add_library(libvpx_yasm STATIC IMPORTED)
-#set_target_properties(libvpx_yasm PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/third_party/libvpx/source/libvpx/vpx_dsp/x86/libvpx_${ANDROID_ABI}_yasm.a)
-#endif()
+if (${ANDROID_ABI} STREQUAL "x86" OR ${ANDROID_ABI} STREQUAL "x86_64")
+add_library(libvpx_yasm STATIC IMPORTED)
+set_target_properties(libvpx_yasm PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/third_party/libvpx/source/libvpx/vpx_dsp/x86/libvpx_${ANDROID_ABI}_yasm.a)
+endif()
 
 #tgvoip
 add_library(tgvoip STATIC
diff --git a/TMessagesProj/jni/voip/tgcalls/group/AudioStreamingPart.cpp b/TMessagesProj/jni/voip/tgcalls/group/AudioStreamingPart.cpp
index f10c6104f..342a03daf 100644
--- a/TMessagesProj/jni/voip/tgcalls/group/AudioStreamingPart.cpp
+++ b/TMessagesProj/jni/voip/tgcalls/group/AudioStreamingPart.cpp
@@ -298,6 +298,12 @@ public:
         int outPcmSampleOffset = 0;
         ReadPcmResult result;
 
+        if(_channelCount==0)
+        {
+            RTC_LOG(LS_WARNING) << "_channelCount == 0, returned.";
+            return result;
+        }
+
         int readSamples = (int)outPcm.size() / _channelCount;
 
         result.numChannels = _channelCount;