diff --git a/dart_quill_delta/lib/src/delta/delta.dart b/dart_quill_delta/lib/src/delta/delta.dart
index 95ee0f87..fc0527bc 100644
--- a/dart_quill_delta/lib/src/delta/delta.dart
+++ b/dart_quill_delta/lib/src/delta/delta.dart
@@ -147,7 +147,7 @@ class Delta {
   Operation get last => operations.last;
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is! Delta) return false;
     final typedOther = other;
diff --git a/example/lib/screens/quill/my_quill_editor.dart b/example/lib/screens/quill/my_quill_editor.dart
index e5f05981..28ab3100 100644
--- a/example/lib/screens/quill/my_quill_editor.dart
+++ b/example/lib/screens/quill/my_quill_editor.dart
@@ -1,5 +1,4 @@
 import 'dart:io' as io show Directory, File;
-import 'dart:ui' show FontFeature;
 
 import 'package:cached_network_image/cached_network_image.dart'
     show CachedNetworkImageProvider;
diff --git a/example/lib/screens/settings/cubit/settings_cubit.freezed.dart b/example/lib/screens/settings/cubit/settings_cubit.freezed.dart
index 1a0795df..4799a386 100644
--- a/example/lib/screens/settings/cubit/settings_cubit.freezed.dart
+++ b/example/lib/screens/settings/cubit/settings_cubit.freezed.dart
@@ -149,7 +149,7 @@ class _$SettingsStateImpl implements _SettingsState {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$SettingsStateImpl &&
diff --git a/lib/src/widgets/raw_editor/raw_editor_state.dart b/lib/src/widgets/raw_editor/raw_editor_state.dart
index d33d0cdc..ca35c077 100644
--- a/lib/src/widgets/raw_editor/raw_editor_state.dart
+++ b/lib/src/widgets/raw_editor/raw_editor_state.dart
@@ -876,7 +876,7 @@ class QuillRawEditorState extends EditorState
       if (parentBlock.style.containsKey(Attribute.ol.key) ||
           parentBlock.style.containsKey(Attribute.ul.key) ||
           parentBlock.style.containsKey(Attribute.checked.key)) {
-        controller.indentSelection(!event.isShiftPressed);
+        controller.indentSelection(!HardwareKeyboard.instance.isShiftPressed);
       }
       return KeyEventResult.handled;
     }
@@ -905,7 +905,7 @@ class QuillRawEditorState extends EditorState
           controller.selection.base.offset > node.documentOffset) {
         return insertTabCharacter();
       }
-      controller.indentSelection(!event.isShiftPressed);
+      controller.indentSelection(!HardwareKeyboard.instance.isShiftPressed);
       return KeyEventResult.handled;
     }