diff --git a/client/Mac/main.m b/client/Mac/main.m
index 0f1916e2c..6b1035f87 100644
--- a/client/Mac/main.m
+++ b/client/Mac/main.m
@@ -19,7 +19,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
 	return NSApplicationMain(argc, argv);
 }
diff --git a/server/Mac/mf_rdpsnd.c b/server/Mac/mf_rdpsnd.c
index e1946f261..4962f0c68 100644
--- a/server/Mac/mf_rdpsnd.c
+++ b/server/Mac/mf_rdpsnd.c
@@ -113,11 +113,11 @@ static void mf_peer_rdpsnd_activated(RdpsndServerContext* context)
 	mf_rdpsnd_derive_buffer_size(recorderState.queue, &recorderState.dataFormat, 0.05,
 	                             &recorderState.bufferByteSize);
 
-	for (int i = 0; i < SND_NUMBUFFERS; ++i)
+	for (size_t x = 0; x < SND_NUMBUFFERS; ++x)
 	{
 		AudioQueueAllocateBuffer(recorderState.queue, recorderState.bufferByteSize,
-		                         &recorderState.buffers[i]);
-		AudioQueueEnqueueBuffer(recorderState.queue, recorderState.buffers[i], 0, NULL);
+		                         &recorderState.buffers[x]);
+		AudioQueueEnqueueBuffer(recorderState.queue, recorderState.buffers[x], 0, NULL);
 	}
 
 	recorderState.currentPacket = 0;
@@ -141,7 +141,7 @@ BOOL mf_peer_rdpsnd_init(mfPeerContext* context)
 	return TRUE;
 }
 
-BOOL mf_peer_rdpsnd_stop()
+BOOL mf_peer_rdpsnd_stop(void)
 {
 	recorderState.isRunning = false;
 	AudioQueueStop(recorderState.queue, true);