diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aeabf11..bfaff5f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -250,14 +250,6 @@ jobs:
             echo "TAG_EXISTS=false" >> $GITHUB_ENV
           fi
 
-        #12 Modify Tag if it Exists
-      - name: Modify Tag
-        if: env.TAG_EXISTS && inputs.build_github
-        id: modify_tag
-        run: |
-          new_version="${{ env.VERSION }}-build-${{ github.run_number }}"
-          echo "VERSION=$new_version" >> $GITHUB_ENV
-
         #13 Create Release
       - name: Create Release
         if: inputs.build_github
diff --git a/lib/utils/keymap/keymap.dart b/lib/utils/keymap/keymap.dart
index c5709b3..e97c80a 100644
--- a/lib/utils/keymap/keymap.dart
+++ b/lib/utils/keymap/keymap.dart
@@ -115,10 +115,16 @@ class KeyPair {
           )
         : Offset.zero;
 
+    final buttons = decoded['actions']
+        .map<ControllerButton?>((e) => ControllerButton.values.firstOrNullWhere((element) => element.name == e))
+        .where((e) => e != null)
+        .cast<ControllerButton>()
+        .toList();
+    if (buttons.isEmpty) {
+      return null;
+    }
     return KeyPair(
-      buttons: decoded['actions']
-          .map<ControllerButton>((e) => ControllerButton.values.firstWhere((element) => element.name == e))
-          .toList(),
+      buttons: buttons,
       logicalKey: decoded.containsKey('logicalKey') && int.parse(decoded['logicalKey']) != 0
           ? LogicalKeyboardKey(int.parse(decoded['logicalKey']))
           : null,
diff --git a/lib/widgets/logviewer.dart b/lib/widgets/logviewer.dart
index 9d069ff..4f9bdc0 100644
--- a/lib/widgets/logviewer.dart
+++ b/lib/widgets/logviewer.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../bluetooth/messages/notification.dart';
@@ -27,7 +28,7 @@ class _LogviewerState extends State<LogViewer> {
       if (mounted) {
         setState(() {
           _actions.add((date: DateTime.now(), entry: data.toString()));
-          _actions = _actions.takeLast(60).toList();
+          _actions = _actions.takeLast(kIsWeb ? 1000 : 60).toList();
         });
         if (_scrollController.hasClients) {
           // scroll to the bottom