diff --git a/sunshine/input.cpp b/sunshine/input.cpp
index 6be53163..51b608a2 100644
--- a/sunshine/input.cpp
+++ b/sunshine/input.cpp
@@ -303,6 +303,20 @@ void repeat_key(short key_code) {
   task_id = task_pool.pushDelayed(repeat_key, config::input.key_repeat_period, key_code).task_id;
 }
 
+short map_keycode(short keycode) {
+  keycode &= 0x00FF;
+
+  switch(keycode) {
+  case 0x10:
+    return 0xA0;
+  case 0x11:
+    return 0xA2;
+  case 0x12:
+    return 0xA4;
+  }
+
+  return keycode;
+}
 void passthrough(std::shared_ptr<input_t> &input, PNV_KEYBOARD_PACKET packet) {
   auto constexpr BUTTON_RELEASED = 0x04;
 
@@ -330,7 +344,8 @@ void passthrough(std::shared_ptr<input_t> &input, PNV_KEYBOARD_PACKET packet) {
   }
 
   pressed = !release;
-  platf::keyboard(platf_input, packet->keyCode & 0x00FF, release);
+
+  platf::keyboard(platf_input, map_keycode(packet->keyCode), release);
 }
 
 void passthrough(PNV_SCROLL_PACKET packet) {
diff --git a/sunshine/main.cpp b/sunshine/main.cpp
index 44b9bda1..daf47cdc 100644
--- a/sunshine/main.cpp
+++ b/sunshine/main.cpp
@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) {
     return 0;
   }
 
-  if(config::sunshine.min_log_level >= 2) {
+  if(config::sunshine.min_log_level >= 1) {
     av_log_set_level(AV_LOG_QUIET);
   }
   else {