diff --git a/src/components/GameEntry/GameEntry.jsx b/src/components/GameEntry/GameEntry.jsx
index 2747e84..ace8504 100644
--- a/src/components/GameEntry/GameEntry.jsx
+++ b/src/components/GameEntry/GameEntry.jsx
@@ -10,7 +10,7 @@ export default ({ name, ifdb, url }) => (
     <h4>{name}</h4>
     <a
       target='_blank'
-      rel='noopener'
+      rel='noopener noreferrer'
       href={ifdb}>
       IFDB page
     </a>
diff --git a/src/components/Player/GridBuffer.jsx b/src/components/Player/GridBuffer.jsx
index 7a2883a..f29256e 100644
--- a/src/components/Player/GridBuffer.jsx
+++ b/src/components/Player/GridBuffer.jsx
@@ -1,5 +1,5 @@
 import { h } from 'preact'
-import { useEffect, useRef, useState } from 'preact/hooks'
+import { useEffect, useState } from 'preact/hooks'
 
 import TextMessage from './TextMessage'
 
@@ -16,7 +16,7 @@ export default function ({ inbox, currentWindow }) {
 
     const newOrPrev = (cur, prev) => i => {
       const byId = (list, i) =>
-        list.find(({line}) => line === i)
+        list.find(({ line }) => line === i)
 
       return byId(cur, i) || byId(prev, i)
     }
@@ -33,7 +33,7 @@ export default function ({ inbox, currentWindow }) {
       rawMessages
         .map(x => x.content)
         .map(([x]) => x)
-        .map(({text}) => text)
+        .map(({ text }) => text)
         .map(text => text.trim())
 
     const isEmpty =
@@ -47,10 +47,11 @@ export default function ({ inbox, currentWindow }) {
           text.replace('   ', ' / '))
         .map(text => ({
           style: 'grid',
-          text}))
+          text
+        }))
 
     setMessages(isEmpty ? [] : messages)
-  }, [inbox, currentWindow])
+  }, [inbox, currentWindow, prevMessages])
 
   return (
     <section
diff --git a/src/components/Player/Status.jsx b/src/components/Player/Status.jsx
index d376c6f..6e48615 100644
--- a/src/components/Player/Status.jsx
+++ b/src/components/Player/Status.jsx
@@ -6,7 +6,7 @@ const fail = details => (
     <h1>
       Error
     </h1>
-    {details.map(x => (<p>{x}</p>))}
+    {details.map(x => (<p key={x}>{x}</p>))}
     <hr />
     <Link href='/'>
       Home
@@ -14,7 +14,7 @@ const fail = details => (
     |
     <a
       target='_blank'
-      rel='noopener'
+      rel='noopener noreferrer'
       href='https://github.com/He4eT/ifplayer/issues'>
       Report bug
     </a>
@@ -23,7 +23,7 @@ const fail = details => (
 
 const loading = details => (
   <div class='status loading'>
-    {details.map(x => (<div>{x}</div>))}
+    {details.map(x => (<div key={x}>{x}</div>))}
   </div>
 )
 
diff --git a/src/components/Player/TextBuffer.jsx b/src/components/Player/TextBuffer.jsx
index a475f0b..4d4976b 100644
--- a/src/components/Player/TextBuffer.jsx
+++ b/src/components/Player/TextBuffer.jsx
@@ -57,7 +57,7 @@ export default function ({ inbox, currentWindow }) {
     const { incoming, clear } =
       parseInbox(inbox, currentWindow)
 
-    setMessages(clear
+    setMessages(messages => clear
       ? incoming
       : messages.concat(incoming))
 
@@ -72,7 +72,7 @@ export default function ({ inbox, currentWindow }) {
           ? lastInput.offsetTop
           : textBufferEl.current.scrollHeight * 2
     }, 0)
-  }, [inbox])
+  }, [currentWindow, inbox])
 
   const classes = [
     isFakeStatus(currentWindow)
@@ -85,7 +85,7 @@ export default function ({ inbox, currentWindow }) {
       tabindex='0'
       ref={textBufferEl}
       className={classes}>
-      {messages.map(TextMessage)}
+        {messages.map(TextMessage)}
     </section>
   )
 }
diff --git a/src/components/Player/common/engines.js b/src/components/Player/common/engines.js
index 7e80045..bb713f5 100644
--- a/src/components/Player/common/engines.js
+++ b/src/components/Player/common/engines.js
@@ -32,7 +32,6 @@ export const engineByFilename = filename => {
 
   if (format) {
     return format.engine
-  } else {
-    throw new Error('Unsupported file type')
   }
+  throw new Error('Unsupported file type')
 }
diff --git a/src/components/ThemeSelector/ThemeSelector.jsx b/src/components/ThemeSelector/ThemeSelector.jsx
index 8d1b69e..dc507bc 100644
--- a/src/components/ThemeSelector/ThemeSelector.jsx
+++ b/src/components/ThemeSelector/ThemeSelector.jsx
@@ -2,8 +2,10 @@ import { h } from 'preact'
 
 export default function ({ themeEngine }) {
   const options = themeEngine.themes.map(theme => (
-    <option value={theme}>
-      {theme}
+    <option
+      key={theme}
+      value={theme}>
+        {theme}
     </option>))
 
   return (
diff --git a/src/views/GamesView/GamesView.jsx b/src/views/GamesView/GamesView.jsx
index 9c948ce..89ede6c 100644
--- a/src/views/GamesView/GamesView.jsx
+++ b/src/views/GamesView/GamesView.jsx
@@ -21,7 +21,7 @@ export default function () {
       <h1>
         <a
           target='_blank'
-          rel='noopener'
+          rel='noopener noreferrer'
           href='https://ifdb.org/'
           title='The Interactive Fiction Database'>
           IFDB
@@ -60,21 +60,21 @@ export default function () {
       <p>
         <a
           target='_blank'
-          rel='noopener'
+          rel='noopener noreferrer'
           href='https://ifdb.org/search?comp&sortby=awn&searchfor=series%3AInteractive+Fiction+Top+50+of+All+Time'>
           Every four years </a>, Victor Gijsbers puts
         together a list of the top 50 IF games of all time.
 
         Here is an almost complete version of the <a
           target='_blank'
-          rel='noopener'
+          rel='noopener noreferrer'
           href='https://ifdb.org/viewcomp?id=1lv599reviaxvwo7'>
           list for 2019</a>:
       </p>
 
       <ol>
         {top2019.map(game => (
-          <li>
+          <li key={game[0]}>
             <GameEntry {...{
               ...game
             }} />
diff --git a/src/views/HomeView/HomeView.jsx b/src/views/HomeView/HomeView.jsx
index 7fb2c0f..e48b82d 100644
--- a/src/views/HomeView/HomeView.jsx
+++ b/src/views/HomeView/HomeView.jsx
@@ -31,7 +31,7 @@ export default function ({ themeEngine }) {
           <br />
           Source code can be found in this <a
             target='_blank'
-            rel='noopener'
+            rel='noopener noreferrer'
             href='https://github.com/He4eT/ifplayer'>
             repository
           </a>.
diff --git a/src/views/NotFoundView.jsx b/src/views/NotFoundView.jsx
index b189926..6dfff92 100644
--- a/src/views/NotFoundView.jsx
+++ b/src/views/NotFoundView.jsx
@@ -17,7 +17,7 @@ export default () => (
       |
       <a
         target='_blank'
-        rel='noopener'
+        rel='noopener noreferrer'
         href='https://github.com/He4eT/ifplayer/issues'>
         Report bug
       </a>
diff --git a/src/views/PlayerView/PlayerView.jsx b/src/views/PlayerView/PlayerView.jsx
index 9548328..3dc6d5e 100644
--- a/src/views/PlayerView/PlayerView.jsx
+++ b/src/views/PlayerView/PlayerView.jsx
@@ -10,7 +10,7 @@ const decode = encodedUrl => decodeURIComponent(encodedUrl)
 export default function ({
   setTheme, theme, encodedUrl, singleWindow
 }) {
-  useEffect(() => setTheme(theme), [theme])
+  useEffect(() => setTheme(theme), [setTheme, theme])
 
   const [targetUrl, setTargetUrl] = useState(decode(encodedUrl))