diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9a110b0b..c8959b056 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ include(SuperTux/BuildVersion)
 set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/games/supertux2")
 
 set(BUILD_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/data")
-set(BUILD_CONFIG_DATA_DIR "${CMAKE_BINARY_DIR}/data")
+set(BUILD_CONFIG_DATA_DIR "/data")
 
 ## Options for install
 if(WIN32 AND NOT UNIX)
diff --git a/data/AUTHORS b/data/AUTHORS
index b54732eb1..c962bde3d 100644
--- a/data/AUTHORS
+++ b/data/AUTHORS
@@ -12,7 +12,7 @@ Most graphics as of 0.7 were created by Rustybox, Eauix, WeLuvGoatz, FrostC, Fil
 * images/objects/explosion/explosion*.png - Bleed - http://remusprites.carbonmade.com/ licensed under CC-BY 3.0, see https://opengameart.org/content/simple-explosion-bleeds-game-art
 * images/engine/editor/sparkle-file.png - Semphris, licensed CC-BY 4.0 - CONTAINS WORK BY FortAwesome/FontAwesome (the file logo), licensed under CC-BY 4.0
 * images/worldmap/shared/rocky_paths[-editor].png - Semphris, released under CC0
-* images/objects/conveyor_belt/* - submitted by RodirodDude CC BY-NC 4.0
+* images/objects/conveyor_belt/* - drawn for wasmga.me, CC0
 
 == Levels ==
 
@@ -134,7 +134,7 @@ These are just more code.
 * invincible_start.ogg - self-made sound by Wansti
 * jump.wav - self-made by wansti
 * kick.wav - replaced with a self-made sound by Some_Person
-* kill.wav - submitted by RodirodDude CC BY-NC 4.0
+* kill.wav - copy of hurt.wav
 * lava.wav - submitted as GPL by Bastian Zapf
 * lifeup.wav - added Fri May 14 05:24:24 2004 UTC by sik0fewl. Message was "added sounds from Nathan McCoy" -sommer 22:43, 4 Jan 2007 (CET)
 * lightning.wav - sampled by Some_Person from http://www.pdsounds.org/sounds/storm_thunderbolts
diff --git a/mk/cmake/SuperTux/Emscripten.cmake b/mk/cmake/SuperTux/Emscripten.cmake
index 58b9f6b4c..b41d0a515 100644
--- a/mk/cmake/SuperTux/Emscripten.cmake
+++ b/mk/cmake/SuperTux/Emscripten.cmake
@@ -4,7 +4,7 @@ set(SQ_DISABLE_INSTALLER YES)
 set(SSQ_BUILD_INSTALL NO)
 
 set(EM_USE_FLAGS "-sDISABLE_EXCEPTION_CATCHING=0 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS='[\"png\",\"jpg\"]' -sUSE_VORBIS=1")
-set(EM_LINK_FLAGS " -sINITIAL_MEMORY=134217728 -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=536870912 -sERROR_ON_UNDEFINED_SYMBOLS=0 --preload-file ${BUILD_CONFIG_DATA_DIR} --use-preload-plugins -lidbfs.js")
+set(EM_LINK_FLAGS " -sINITIAL_MEMORY=134217728 -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=536870912 -sERROR_ON_UNDEFINED_SYMBOLS=0 -sINVOKE_RUN=0 -sEXPORTED_RUNTIME_METHODS=callMain,cwrap,ccall,FS -lidbfs.js")
 if(ENABLE_OPENGL)
   set(EM_LINK_FLAGS "${EM_LINK_FLAGS} -sFULL_ES2")
   set(HAVE_OPENGL ON CACHE BOOL "")