diff --git a/source/lib/sysdep/arch/x86_x64/x86_x64.cpp b/source/lib/sysdep/arch/x86_x64/x86_x64.cpp
index ea7a7d449f..daf7f850d5 100644
--- a/source/lib/sysdep/arch/x86_x64/x86_x64.cpp
+++ b/source/lib/sysdep/arch/x86_x64/x86_x64.cpp
@@ -69,6 +69,7 @@ bool x86_x64_cpuid(x86_x64_CpuidRegs* regs)
 	{
 		x86_x64_CpuidRegs regs2;
 		regs2.eax = 0;
+		regs2.ecx = 0; // necessary to avoid valgrind uninitialized-value warnings
 		cpuid_impl(&regs2);
 		maxFunction = regs2.eax;
 		regs2.eax = 0x80000000;
@@ -94,6 +95,7 @@ static void DetectFeatureFlags(u32 caps[4])
 {
 	x86_x64_CpuidRegs regs;
 	regs.eax = 1;
+	regs.ecx = 0; // necessary to avoid valgrind uninitialized-value warnings
 	if(x86_x64_cpuid(&regs))
 	{
 		caps[0] = regs.ecx;
diff --git a/source/simulation/AStarEngine.cpp b/source/simulation/AStarEngine.cpp
index 6a6195d282..f96e507273 100644
--- a/source/simulation/AStarEngine.cpp
+++ b/source/simulation/AStarEngine.cpp
@@ -114,12 +114,6 @@ CAStarEngine::CAStarEngine()
 	pathfindingOverlay = new PathFindingTerrainOverlay();
 }
 
-CAStarEngine::CAStarEngine(AStarGoalBase *goal)
-{
-	CAStarEngine();
-	mGoal = goal;
-}
-
 
 CAStarEngine::~CAStarEngine()
 {
@@ -133,6 +127,8 @@ CAStarEngine::~CAStarEngine()
 	{
 		delete (*it);
 	}
+
+	delete pathfindingOverlay;
 }
 
 /*
diff --git a/source/simulation/AStarEngine.h b/source/simulation/AStarEngine.h
index 4d01fe52e9..f099f4104c 100644
--- a/source/simulation/AStarEngine.h
+++ b/source/simulation/AStarEngine.h
@@ -86,7 +86,6 @@ class CAStarEngine
 {
 public:
 	CAStarEngine();
-	CAStarEngine(AStarGoalBase* goal);
 	virtual ~CAStarEngine();
 
 	void SetGoal(AStarGoalBase* goal) { mGoal = goal; }