diff --git a/src/client.cpp b/src/client.cpp
index d03162b3c2..4794cc6ef0 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1173,7 +1173,8 @@ void CClient::ProcessSndCrdAudioData ( CVector<int16_t>& vecsStereoSndCrd )
 
 void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
 {
-    int            i, j, iUnused;
+    int_fast8_t    i, j;
+    int            iUnused;
     unsigned char* pCurCodedData;
 
     // Transmit signal ---------------------------------------------------------
diff --git a/src/client.h b/src/client.h
index 75b6813614..3fd43f06f8 100644
--- a/src/client.h
+++ b/src/client.h
@@ -306,10 +306,10 @@ class CClient : public QObject
     OpusCustomDecoder*     CurOpusDecoder;
     EAudComprType          eAudioCompressionType;
     int                    iCeltNumCodedBytes;
-    int                    iOPUSFrameSizeSamples;
+    uint_fast8_t           iOPUSFrameSizeSamples;
     EAudioQuality          eAudioQuality;
     EAudChanConf           eAudioChannelConf;
-    int                    iNumAudioChannels;
+    uint_fast8_t           iNumAudioChannels;
     bool                   bIsInitializationPhase;
     bool                   bMuteOutStream;
     float                  fMuteOutStreamGain;