diff --git a/package.json b/package.json
index 69f9901..2b6373d 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "dependencies": {
         "@babel/polyfill": "^7.0.0",
         "file-saver": "^1.3.8",
-        "gps-to-gpx": "git://github.com/phyks/gps-to-gpx.git#2c9da24ca98ecd520ee75276714d4df337696475",
+        "gps-to-gpx": "git://github.com/phyks/gps-to-gpx.git#1cb5adf4dd382266d076d7df3cb5aa3a4d7dd27b",
         "material-icons": "^0.2.3",
         "nosleep.js": "^0.7.0",
         "ol": "^5.3.0",
diff --git a/src/tools/exportGPX.js b/src/tools/exportGPX.js
index c037881..0096391 100644
--- a/src/tools/exportGPX.js
+++ b/src/tools/exportGPX.js
@@ -1,5 +1,5 @@
 import FileSaver from 'file-saver';
-import createGPX from 'gps-to-gpx';
+import createGPX from 'gps-to-gpx/es/createGpx';
 
 import { VERSION } from '@/constants';
 import { formatDate } from '@/tools/date';
diff --git a/src/views/Map.vue b/src/views/Map.vue
index 679ca65..d39ce3c 100644
--- a/src/views/Map.vue
+++ b/src/views/Map.vue
@@ -53,7 +53,9 @@
 </template>
 
 <script>
-import NoSleep from 'nosleep.js';
+// Import directly from dist to avoid ES6 issues
+// See https://github.com/richtr/NoSleep.js/issues/46.
+import NoSleep from 'nosleep.js/dist/NoSleep';
 
 import Alert from '@/components/Alert.vue';
 import Map from '@/components/Map.vue';
diff --git a/yarn.lock b/yarn.lock
index 6dfcc46..dc4587a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4177,9 +4177,9 @@ got@^8.3.1:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-"gps-to-gpx@git://github.com/phyks/gps-to-gpx.git#2c9da24ca98ecd520ee75276714d4df337696475":
+"gps-to-gpx@git://github.com/phyks/gps-to-gpx.git#1cb5adf4dd382266d076d7df3cb5aa3a4d7dd27b":
   version "1.4.0"
-  resolved "git://github.com/phyks/gps-to-gpx.git#2c9da24ca98ecd520ee75276714d4df337696475"
+  resolved "git://github.com/phyks/gps-to-gpx.git#1cb5adf4dd382266d076d7df3cb5aa3a4d7dd27b"
   dependencies:
     babel-runtime "6.18.0"
     loose-envify "1.3.0"