diff --git a/libraries/libstratosphere/source/fs/fs_code.cpp b/libraries/libstratosphere/source/fs/fs_code.cpp
index 6aaa7dd6f..e6d10aef3 100644
--- a/libraries/libstratosphere/source/fs/fs_code.cpp
+++ b/libraries/libstratosphere/source/fs/fs_code.cpp
@@ -241,6 +241,7 @@ namespace ams::fs {
                     R_TRY(OpenSdCardCodeOrCodeFileSystemImpl(std::addressof(fsa), path, program_id));
                     this->code_fs.emplace(std::move(fsa), program_id, is_specific);
 
+                    this->program_id = program_id;
                     this->initialized = true;
 
                     return ResultSuccess();
diff --git a/libraries/libvapours/include/vapours/util/util_bounded_map.hpp b/libraries/libvapours/include/vapours/util/util_bounded_map.hpp
index b0d2b7c27..41f7593c0 100644
--- a/libraries/libvapours/include/vapours/util/util_bounded_map.hpp
+++ b/libraries/libvapours/include/vapours/util/util_bounded_map.hpp
@@ -116,7 +116,6 @@ namespace ams::util {
 
                 /* Find a free value. */
                 for (size_t i = 0; i < N; i++) {
-                    this->keys[i] = key;
                     if (!this->keys[i]) {
                         this->keys[i] = key;
                         new (GetPointer(this->values[i])) Value(std::forward<Args>(args)...);