diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index d9e4ac954..73e54ca27 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -2807,7 +2807,8 @@ void CClient::Run()
 #if defined(CONF_VIDEORECORDER)
 	IVideo::SetLocalStartTime(m_LocalStartTime);
 #endif
-	m_SnapshotParts = 0;
+	m_SnapshotParts[0] = 0;
+	m_SnapshotParts[1] = 0;
 
 	if(m_GenerateTimeoutSeed)
 	{
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index b92e2e33a..f012c0258 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -854,12 +854,11 @@ void CMenus::RenderDemoList(CUIRect MainView)
 	ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
 	ButtonBar.VSplitLeft(110.0f, &RenameRect, &ButtonBar);
 	ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
-	ButtonBar.VSplitLeft(110.0f, &LabelRect, &ButtonBar);
-	ButtonBar.VSplitLeft(120.0f, &RenameRect, &ButtonBar);
 #if defined(CONF_VIDEORECORDER)
-	ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
 	ButtonBar.VSplitLeft(110.0f, &RenderRect, &ButtonBar);
+	ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
 #endif
+	ButtonBar.VSplitLeft(110.0f, &LabelRect, &ButtonBar);
 	MainView.HSplitBottom(140.0f, &ListBox, &MainView);
 
 	// render demo info
diff --git a/src/game/client/components/skins.cpp b/src/game/client/components/skins.cpp
index 9bccf02e2..4d649d145 100644
--- a/src/game/client/components/skins.cpp
+++ b/src/game/client/components/skins.cpp
@@ -4,6 +4,7 @@
 
 #include <base/system.h>
 #include <base/math.h>
+#include <ctime>
 
 #include <engine/graphics.h>
 #include <engine/storage.h>
@@ -156,7 +157,7 @@ void CSkins::OnInit()
 	{
 		time_t rawtime;
 		struct tm* timeinfo;
-		time(&rawtime);
+		std::time(&rawtime);
 		timeinfo = localtime(&rawtime);
 		if(timeinfo->tm_mon == 11 && timeinfo->tm_mday >= 24 && timeinfo->tm_mday <= 26)
 		{ // Christmas