diff --git a/src/client.c b/src/client.c
index 8840dcc..a856cd3 100644
--- a/src/client.c
+++ b/src/client.c
@@ -322,7 +322,7 @@ struct app_list *client_applist(const char *address) {
   return list;
 }
 
-int client_get_app_id(const char *address, char *name) {
+int client_get_app_id(const char *address, const char *name) {
   struct app_list *list = client_applist(address);
   while (list != NULL) {
     if (strcmp(list->name, name) == 0)
diff --git a/src/client.h b/src/client.h
index da93cd7..38eb1ac 100644
--- a/src/client.h
+++ b/src/client.h
@@ -26,7 +26,7 @@
 void client_init(const char* serverAddress);
 void client_start_app(STREAM_CONFIGURATION *config, const char* serverAddress, int appId, bool sops, bool localaudio);
 struct app_list* client_applist(const char* serverAddress);
-int client_get_app_id(const char* serverAddress, char* name);
+int client_get_app_id(const char* serverAddress, const char* name);
 void client_pair(const char *address);
 int client_get_server_version(void);
 bool client_is_paired(const char *address);
diff --git a/src/input.c b/src/input.c
index 303ed7f..0d0824d 100644
--- a/src/input.c
+++ b/src/input.c
@@ -83,7 +83,7 @@ static void input_init_parms(struct input_device *dev, struct input_abs_parms *p
   parms->diff = parms->max - parms->min;
 }
 
-void input_create(char* device, char* mapFile) {
+void input_create(const char* device, char* mapFile) {
   int fd = open(device, O_RDONLY|O_NONBLOCK);
   if (fd <= 0) {
     fprintf(stderr, "Failed to open device %s\n", device);
@@ -275,7 +275,7 @@ static bool input_handle_event(struct input_event *ev, struct input_device *dev)
     break;
   case EV_KEY:
     if (ev->code < sizeof(keyCodes)/sizeof(keyCodes[0])) {
-      char modifier = NULL;
+      char modifier = 0;
       switch (ev->code) {
       case KEY_LEFTSHIFT:
       case KEY_RIGHTSHIFT:
@@ -290,7 +290,7 @@ static bool input_handle_event(struct input_event *ev, struct input_device *dev)
         modifier = MODIFIER_CTRL;
         break;
       }
-      if (modifier != NULL) {
+      if (modifier != 0) {
         if (ev->value)
           dev->modifiers |= modifier;
         else