diff --git a/src/api/api.h b/src/api/api.h
index a2939796..8af9b8fe 100644
--- a/src/api/api.h
+++ b/src/api/api.h
@@ -264,11 +264,6 @@ BOSS_API void     boss_destroy_db (boss_db db);
 ***************************************/
 ///@{
 
-//
-// Can be called multiple times. On error, the database is unchanged.
-// Paths are case-sensitive if the underlying filesystem is case-sensitive.
-// masterlistPath and userlistPath are files.
-
 /**
     @brief Loads the masterlist and userlist from the paths specified.
     @details Can be called multiple times, each time replacing the previously-loaded data.
@@ -350,8 +345,6 @@ BOSS_API unsigned int boss_get_plugin_messages (boss_db db, const char * const p
     @returns A return code.
 */
 
-// Outputs the first warning message found for the given plugin that warns about dirty edits (ie. no message, in which case *message == NULL). needsCleaning is one of the plugin cleanliness codes above.
-
 BOSS_API unsigned int boss_get_dirty_message (boss_db db, const char * const plugin,
                                               boss_message * const message,
                                               unsigned int * const needsCleaning);
diff --git a/src/backend/helpers.cpp b/src/backend/helpers.cpp
index 7da4b30d..06ae475c 100644
--- a/src/backend/helpers.cpp
+++ b/src/backend/helpers.cpp
@@ -211,7 +211,7 @@ namespace boss {
 
     boost::filesystem::path GetLocalAppDataPath() {
 #if _WIN32 || _WIN64
-        HWND owner;
+        HWND owner = 0;
         TCHAR path[MAX_PATH];
 
         BOOST_LOG_TRIVIAL(trace) << "Getting path to %LOCALAPPDATA%.";
diff --git a/src/backend/parsers.h b/src/backend/parsers.h
index 956649e5..557a7830 100644
--- a/src/backend/parsers.h
+++ b/src/backend/parsers.h
@@ -78,16 +78,14 @@ namespace YAML {
             if (!node.IsMap() || !node["folder"] || !node["type"])
                 return false;
 
-            boss::Game game(node["folder"].as<std::string>());
-
             if (node["type"].as<std::string>() == boss::Game(boss::g_game_tes4).FolderName())
-                rhs = boss::Game(boss::g_game_tes4, game.FolderName());
+                rhs = boss::Game(boss::g_game_tes4, node["folder"].as<std::string>());
             else if (node["type"].as<std::string>() == boss::Game(boss::g_game_tes5).FolderName())
-                rhs = boss::Game(boss::g_game_tes5, game.FolderName());
+                rhs = boss::Game(boss::g_game_tes5, node["folder"].as<std::string>());
             else if (node["type"].as<std::string>() == boss::Game(boss::g_game_fo3).FolderName())
-                rhs = boss::Game(boss::g_game_fo3, game.FolderName());
+                rhs = boss::Game(boss::g_game_fo3, node["folder"].as<std::string>());
             else if (node["type"].as<std::string>() == boss::Game(boss::g_game_fonv).FolderName())
-                rhs = boss::Game(boss::g_game_fonv, game.FolderName());
+                rhs = boss::Game(boss::g_game_fonv, node["folder"].as<std::string>());
             else
                 return false;