diff --git a/src/calibre/gui2/viewer/highlights.py b/src/calibre/gui2/viewer/highlights.py
index a9b35c8946..ceb34599c7 100644
--- a/src/calibre/gui2/viewer/highlights.py
+++ b/src/calibre/gui2/viewer/highlights.py
@@ -405,7 +405,7 @@ class NotesDisplay(Details):
         self.setHtml('<div><a href="edit://moo">{}</a></div>{}'.format(_('Edit notes'), html))
         self.document().setDefaultStyleSheet('a[href] { text-decoration: none }')
         h = self.document().size().height() + 2
-        self.setMaximumHeight(h)
+        self.setMaximumHeight(int(h))
 
     def anchor_clicked(self, qurl):
         if qurl.scheme() == 'edit':
diff --git a/src/calibre/gui2/viewer/shortcuts.py b/src/calibre/gui2/viewer/shortcuts.py
index 27638520bb..2800b2bd28 100644
--- a/src/calibre/gui2/viewer/shortcuts.py
+++ b/src/calibre/gui2/viewer/shortcuts.py
@@ -41,8 +41,10 @@ def key_to_text(key):
 def ev_to_index(ev):
     m = ev.modifiers()
     mods = []
-    for x in ('ALT', 'CTRL', 'META', 'SHIFT'):
-        mods.append('y' if m & getattr(Qt, x) else 'n')
+    for x in (
+            Qt.KeyboardModifier.AltModifier, Qt.KeyboardModifier.ControlModifier,
+            Qt.KeyboardModifier.MetaModifier, Qt.KeyboardModifier.ShiftModifier):
+        mods.append('y' if m & x else 'n')
     return ''.join(mods) + key_to_text(ev.key())