diff --git a/src/client/ServerPort.cpp b/src/client/ServerPort.cpp
index 2f714843..30a0e974 100644
--- a/src/client/ServerPort.cpp
+++ b/src/client/ServerPort.cpp
@@ -5,7 +5,7 @@
 
 namespace {
   void write_key_sequence(Serializer& s, const KeySequence& sequence) {
-    s.write(static_cast<uint8_t>(sequence.size()));
+    s.write(static_cast<uint32_t>(sequence.size()));
     for (const auto& event : sequence) {
       s.write(event.key);
       s.write(event.data);
diff --git a/src/server/ClientPort.cpp b/src/server/ClientPort.cpp
index e527fd88..c78c2ca5 100644
--- a/src/server/ClientPort.cpp
+++ b/src/server/ClientPort.cpp
@@ -5,8 +5,8 @@
 namespace {
   KeySequence read_key_sequence(Deserializer& d) {
     auto sequence = KeySequence();
-    auto size = d.read<uint8_t>();
-    for (auto i = 0; i < size; ++i) {
+    auto size = d.read<uint32_t>();
+    for (auto i = 0u; i < size; ++i) {
       auto& event = sequence.emplace_back();
       d.read(&event.key);
       d.read(&event.data);