diff --git a/server/Mac/mf_input.c b/server/Mac/mf_input.c
index 90c0cfdc4..fd4af855d 100644
--- a/server/Mac/mf_input.c
+++ b/server/Mac/mf_input.c
@@ -288,7 +288,7 @@ static const CGKeyCode keymap[256] = {
 	0xFF,                    // 0xfe
 };
 
-BOOL mf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
+BOOL mf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code)
 {
 	CGEventSourceRef source = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
 	BOOL keyDown = TRUE;
diff --git a/server/Mac/mf_input.h b/server/Mac/mf_input.h
index 48330e3ce..4c039f865 100644
--- a/server/Mac/mf_input.h
+++ b/server/Mac/mf_input.h
@@ -22,7 +22,7 @@
 
 #include "mf_interface.h"
 
-BOOL mf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
+BOOL mf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code);
 BOOL mf_input_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
 BOOL mf_input_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
 BOOL mf_input_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
diff --git a/server/Mac/mf_peer.c b/server/Mac/mf_peer.c
index d2cfcb72a..6dcd499df 100644
--- a/server/Mac/mf_peer.c
+++ b/server/Mac/mf_peer.c
@@ -329,7 +329,7 @@ static BOOL mf_peer_synchronize_event(rdpInput* input, UINT32 flags)
 	return TRUE;
 }
 
-void mf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code)
+static BOOL mf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code)
 {
 	bool state_down = FALSE;
 
@@ -337,6 +337,7 @@ void mf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code)
 	{
 		state_down = TRUE;
 	}
+	return TRUE;
 }
 
 static BOOL mf_peer_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
diff --git a/server/shadow/Mac/mac_shadow.c b/server/shadow/Mac/mac_shadow.c
index c55a162f9..b17c82525 100644
--- a/server/shadow/Mac/mac_shadow.c
+++ b/server/shadow/Mac/mac_shadow.c
@@ -350,7 +350,7 @@ static int freerdp_image_copy_from_retina(BYTE* pDstData, DWORD DstFormat, int n
 			R = pSrcPixel[2] + pSrcPixel[6] + pSrcPixel[nSrcStep + 2] + pSrcPixel[nSrcStep + 6];
 			pSrcPixel += 8;
 			color = FreeRDPGetColor(DstFormat, R >> 2, G >> 2, B >> 2, 0xFF);
-			WriteColor(pDstPixel, DstFormat, color);
+			FreeRDPWriteColor(pDstPixel, DstFormat, color);
 			pDstPixel += dstBytesPerPixel;
 		}