diff --git a/client/render/CanvasImage.cpp b/client/render/CanvasImage.cpp
index dc6d619bb..3ed438363 100644
--- a/client/render/CanvasImage.cpp
+++ b/client/render/CanvasImage.cpp
@@ -25,6 +25,11 @@ CanvasImage::CanvasImage(const Point & size, CanvasScalingPolicy scalingPolicy)
 {
 }
 
+CanvasImage::~CanvasImage()
+{
+	SDL_FreeSurface(surface);
+}
+
 void CanvasImage::draw(SDL_Surface * where, const Point & pos, const Rect * src, int scalingFactor) const
 {
 	if(src)
diff --git a/client/render/CanvasImage.h b/client/render/CanvasImage.h
index 095a4276b..56452c926 100644
--- a/client/render/CanvasImage.h
+++ b/client/render/CanvasImage.h
@@ -16,6 +16,7 @@ class CanvasImage : public IImage
 {
 public:
 	CanvasImage(const Point & size, CanvasScalingPolicy scalingPolicy);
+	~CanvasImage();
 
 	Canvas getCanvas();
 
diff --git a/lib/bonuses/CBonusSystemNode.cpp b/lib/bonuses/CBonusSystemNode.cpp
index 9f18a1cb5..e1c2d7f46 100644
--- a/lib/bonuses/CBonusSystemNode.cpp
+++ b/lib/bonuses/CBonusSystemNode.cpp
@@ -188,6 +188,7 @@ std::shared_ptr<Bonus> CBonusSystemNode::getUpdatedBonus(const std::shared_ptr<B
 CBonusSystemNode::CBonusSystemNode(bool isHypotetic):
 	nodeType(UNKNOWN),
 	cachedLast(0),
+	nodeChanged(0),
 	isHypotheticNode(isHypotetic)
 {
 }
@@ -195,6 +196,7 @@ CBonusSystemNode::CBonusSystemNode(bool isHypotetic):
 CBonusSystemNode::CBonusSystemNode(ENodeTypes NodeType):
 	nodeType(NodeType),
 	cachedLast(0),
+	nodeChanged(0),
 	isHypotheticNode(false)
 {
 }
diff --git a/lib/mapping/CMapHeader.cpp b/lib/mapping/CMapHeader.cpp
index 66ed48dbd..62c77d610 100644
--- a/lib/mapping/CMapHeader.cpp
+++ b/lib/mapping/CMapHeader.cpp
@@ -117,8 +117,17 @@ void CMapHeader::setupEvents()
 	defeatMessage.appendTextID("core.lcdesc.0");
 }
 
-CMapHeader::CMapHeader() : version(EMapFormat::VCMI), height(72), width(72),
-	twoLevel(true), difficulty(EMapDifficulty::NORMAL), levelLimit(0), howManyTeams(0), areAnyPlayers(false)
+CMapHeader::CMapHeader()
+	: version(EMapFormat::VCMI)
+	, height(72)
+	, width(72)
+	, twoLevel(true)
+	, difficulty(EMapDifficulty::NORMAL)
+	, levelLimit(0)
+	, howManyTeams(0)
+	, areAnyPlayers(false)
+	, victoryIconIndex(0)
+	, defeatIconIndex(0)
 {
 	setupEvents();
 	allowedHeroes = VLC->heroh->getDefaultAllowed();