diff --git a/src/XMLReader.cpp b/src/XMLReader.cpp
index 7552f159c..af74a993a 100644
--- a/src/XMLReader.cpp
+++ b/src/XMLReader.cpp
@@ -281,9 +281,9 @@ void updateGamelist(SystemData* system)
 					continue;
 				}
 
-				boost::filesystem::path nodePath(pathNode.text().get());
-				boost::filesystem::path gamePath((*fit)->getPath());
-				if(fs::canonical(nodePath) == fs::canonical(gamePath))
+				fs::path nodePath(pathNode.text().get());
+				fs::path gamePath((*fit)->getPath());
+				if(nodePath == gamePath || (fs::exists(nodePath) && fs::exists(gamePath) && fs::equivalent(nodePath, gamePath)))
 				{
 					// found it
 					root.remove_child(fileNode);
diff --git a/src/main.cpp b/src/main.cpp
index 013919bb4..5bf88103d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -249,7 +249,7 @@ int main(int argc, char* argv[])
 	window.deinit();
 	SystemData::deleteSystems();
 
-	std::cout << "EmulationStation cleanly shutting down...\n";
+	LOG(LogInfo) << "EmulationStation cleanly shutting down.";
 
 	return 0;
 }