diff --git a/src/connection.c b/src/connection.c
index 867c36b..f25a508 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of Moonlight Embedded.
  *
- * Copyright (C) 2015 Iwan Timmer
+ * Copyright (C) 2015-2017 Iwan Timmer
  *
  * Moonlight is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,18 +22,15 @@
 
 #include <stdio.h>
 
-void connection_connection_terminated()
-{
+static void connection_connection_terminated() {
   quit();
 }
 
-void connection_display_message(char *msg)
-{
+static void connection_display_message(const char *msg) {
   printf("%s\n", msg);
 }
 
-void connection_display_transient_message(char *msg)
-{
+static void connection_display_transient_message(const char *msg) {
   printf("%s\n", msg);
 }
 
diff --git a/src/input/cec.c b/src/input/cec.c
index 1a50d81..58ec12b 100644
--- a/src/input/cec.c
+++ b/src/input/cec.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of Moonlight Embedded.
  *
- * Copyright (C) 2015 Iwan Timmer
+ * Copyright (C) 2015-2017 Iwan Timmer
  *
  * Moonlight is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,9 +36,9 @@ static char                 g_strPort[50] = { 0 };
 static libcec_interface_t   g_iface;
 static ICECCallbacks        g_callbacks;
 
-static int on_cec_keypress(void* userdata, const cec_keypress key) {
+static void on_cec_keypress(void* userdata, const cec_keypress* key) {
   char value;
-  switch (key.keycode) {
+  switch (key->keycode) {
     case CEC_USER_CONTROL_CODE_UP:
       value = KEY_UP;
       break;
@@ -69,7 +69,7 @@ static int on_cec_keypress(void* userdata, const cec_keypress key) {
   
   if (value != 0) {
     short code = 0x80 << 8 | value;
-    LiSendKeyboardEvent(code, (key.duration > 0)?KEY_ACTION_UP:KEY_ACTION_DOWN, 0);
+    LiSendKeyboardEvent(code, (key->duration > 0)?KEY_ACTION_UP:KEY_ACTION_DOWN, 0);
   }
 }