diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5777cf0bb..12e3b8d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 [[_TOC_]]
 
+## Version 2.0.1 (in development)
+
+### Release overview
+
+### Detailed list of changes
+
+### Bug fixes
+
+* Fixed several container overflows in GuiTextEditKeyboardPopup that could lead to rare crashes when running on an ARM processor
+* Fixed a container overflow in ViewController that could lead to rare crashes when running on an ARM processor
+* (macOS) When opening the main menu an error message was logged about accessing a nonexistent ShowQuitMenu setting
+
+**Release date:** TBD
+
 ## Version 2.0.0
 
 **Release date:** 2023-03-11
diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md
index 256a23e3d..fca82af4a 100644
--- a/INSTALL-DEV.md
+++ b/INSTALL-DEV.md
@@ -540,11 +540,6 @@ export UBSAN_OPTIONS=print_stacktrace=1
 
 These tools aren't very useful without debug symbols so only use them for a Debug or Profiling build. Note that ASAN and TSAN can't be combined.
 
-Specifically on macOS it seems as if AddressSanitizer generates a lot of false positives regarding container overflows, so it may be necessary to ignore these:
-```
-export ASAN_OPTIONS=detect_container_overflow=0
-```
-
 Running `make -j6` (or whatever number of parallel jobs you prefer) speeds up the compilation time if you have cores to spare.
 
 Running ES-DE from the build directory may be a bit flaky as there is no Info.plist file available which is required for setting the proper window mode and such. It's therefore recommended to run the application from the installation directory for any more in-depth testing. But normal debugging can of course be done from the build directory.
diff --git a/INSTALL.md b/INSTALL.md
index 02a20a7a3..5df05ce12 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -538,11 +538,6 @@ export UBSAN_OPTIONS=print_stacktrace=1
 
 These tools aren't very useful without debug symbols so only use them for a Debug or Profiling build. Note that ASAN and TSAN can't be combined.
 
-Specifically on macOS it seems as if AddressSanitizer generates a lot of false positives regarding container overflows, so it may be necessary to ignore these:
-```
-export ASAN_OPTIONS=detect_container_overflow=0
-```
-
 Running `make -j6` (or whatever number of parallel jobs you prefer) speeds up the compilation time if you have cores to spare.
 
 Running ES-DE from the build directory may be a bit flaky as there is no Info.plist file available which is required for setting the proper window mode and such. It's therefore recommended to run the application from the installation directory for any more in-depth testing. But normal debugging can of course be done from the build directory.
diff --git a/ROADMAP.md b/ROADMAP.md
index 5f464dc22..28488fa07 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -36,7 +36,7 @@ A more detailed breakdown can be found on the [Kanban](https://gitlab.com/es-de/
 * _Add GLM library dependency for matrix and vector operations, decommission the built-in functions_
 * _AppImage and AUR releases on Linux_
 
-#### v2.0 (in progress)
+#### v2.0 (in development)
 
 * _New theme engine with generalized views (only System and Gamelist) and theme variants support_
 * _Multiple new components (carousel support for the Gamelist view, grid component etc.)_