diff --git a/bin/extra-lint.js b/bin/extra-lint.js
index 18a2915a..3c811c90 100755
--- a/bin/extra-lint.js
+++ b/bin/extra-lint.js
@@ -18,13 +18,6 @@ files.forEach(function (file) {
   lines.forEach(function (line, i) {
     let error
 
-    // Consistent JSX tag closing
-    if (line.match(/' {2}\/> *$/) ||
-      line.match('[^ ]/> *$') ||
-      line.match(' > *$')) {
-      error = 'JSX tag spacing'
-    }
-
     // No lines over 100 characters
     if (line.length > 100) {
       error = 'Line >100 chars'
diff --git a/package-lock.json b/package-lock.json
index e2c171e3..10b5f64d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2614,9 +2614,9 @@
       "dev": true
     },
     "electron": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.9.tgz",
-      "integrity": "sha512-yCt+lnQr47OWB3Oei19odMVB8VKzecTwZLm75PB56f/keeJAM3UqV7+dtjKlPdKt0hJ4sWxe4vjxGPO/oZDv7A==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.1.tgz",
+      "integrity": "sha512-XY69rI5IThIxsOS2BD+1ZkHE9hqkm4xN5a3WQFSmFRr2by4q5CnIe9vXmptlouGPTLs3tb7ySX/+K9CvH3szvg==",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",
diff --git a/package.json b/package.json
index 412ae82f..f28c3c17 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "buble": "^0.19.6",
     "cross-zip": "^2.0.1",
     "depcheck": "^0.8.0",
-    "electron": "~5.0.9",
+    "electron": "~6.0.1",
     "electron-osx-sign": "^0.4.11",
     "electron-packager": "^14.0.4",
     "electron-winstaller": "^2.6.4",
diff --git a/src/main/index.js b/src/main/index.js
index b11b600f..df5f1537 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -13,6 +13,8 @@ const menu = require('./menu')
 const State = require('../renderer/lib/state')
 const windows = require('./windows')
 
+const WEBTORRENT_VERSION = require('webtorrent/package.json').version
+
 let shouldQuit = false
 let argv = sliceArgv(process.argv)
 
@@ -96,6 +98,12 @@ function init () {
     })
   }
 
+  // Enable app logging into default directory, i.e. /Library/Logs/WebTorrent
+  // on Mac, %APPDATA% on Windows, $XDG_CONFIG_HOME or ~/.config on Linux.
+  app.setAppLogsPath()
+
+  app.userAgentFallback = `WebTorrent/${WEBTORRENT_VERSION} (https://webtorrent.io)`
+
   app.on('open-file', onOpen)
   app.on('open-url', onOpen)
 
diff --git a/src/renderer/lib/telemetry.js b/src/renderer/lib/telemetry.js
index d0e400a2..2883607e 100644
--- a/src/renderer/lib/telemetry.js
+++ b/src/renderer/lib/telemetry.js
@@ -74,7 +74,7 @@ function reset () {
 
 // Track screen resolution
 function getScreenInfo () {
-  return electron.screen.getAllDisplays().map((screen) => ({
+  return electron.remote.screen.getAllDisplays().map((screen) => ({
     width: screen.size.width,
     height: screen.size.height,
     scaleFactor: screen.scaleFactor
diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js
index 165b3a93..d2a8bce4 100644
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -1,3 +1,5 @@
+/* global HTMLMediaElement */
+
 const React = require('react')
 const Bitfield = require('bitfield')
 const prettyBytes = require('prettier-bytes')
@@ -127,7 +129,8 @@ function renderMedia (state) {
       onError={dispatcher('mediaError')}
       onTimeUpdate={dispatcher('mediaTimeUpdate')}
       onEncrypted={dispatcher('mediaEncrypted')}
-      onCanPlay={onCanPlay}>
+      onCanPlay={onCanPlay}
+    >
       {trackTags}
     </MediaTagName>
   )
@@ -166,6 +169,7 @@ function renderMedia (state) {
 
   function onCanPlay (e) {
     const elem = e.target
+    if (elem.readyState < HTMLMediaElement.HAVE_FUTURE_DATA) return
     if (state.playing.type === 'video' &&
       elem.webkitVideoDecodedByteCount === 0) {
       dispatch('mediaError', 'Video codec unsupported')