diff --git a/Editor/RendererWindow.cpp b/Editor/RendererWindow.cpp
index cdcd900a5..422853b10 100644
--- a/Editor/RendererWindow.cpp
+++ b/Editor/RendererWindow.cpp
@@ -385,8 +385,8 @@ RendererWindow::RendererWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
 	});
 	rendererWindow->AddWidget(mipLodBiasSlider);
 
-	raytraceBounceCountSlider = new wiSlider(0, 10, 1, 10, "Raytrace Bounces: ");
-	raytraceBounceCountSlider->SetTooltip("How many indirect light bounces to compute when doing ray tracing.");
+	raytraceBounceCountSlider = new wiSlider(1, 10, 1, 9, "Raytrace Bounces: ");
+	raytraceBounceCountSlider->SetTooltip("How many light bounces to compute when doing ray tracing.");
 	raytraceBounceCountSlider->SetSize(XMFLOAT2(100, sliderheight));
 	raytraceBounceCountSlider->SetPos(XMFLOAT2(x, y += step));
 	raytraceBounceCountSlider->SetValue((float)wiRenderer::GetRaytraceBounceCount());
diff --git a/WickedEngine/wiGraphicsDevice_DX12.cpp b/WickedEngine/wiGraphicsDevice_DX12.cpp
index f725003cf..eb75550e4 100644
--- a/WickedEngine/wiGraphicsDevice_DX12.cpp
+++ b/WickedEngine/wiGraphicsDevice_DX12.cpp
@@ -2944,7 +2944,7 @@ using namespace DX12_Internal;
 
 	void GraphicsDevice_DX12::SetName(GPUResource* pResource, const char* name)
 	{
-		wchar_t text[128];
+		wchar_t text[256];
 		if (wiHelper::StringConvert(name, text) > 0)
 		{
 			auto internal_state = to_internal(pResource);
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index 93b5035db..0e6a34677 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,8 +9,9 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 39;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 79;
+	const int revision = 80;
 
+	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);
 
 	long GetVersion()
 	{
@@ -28,11 +29,9 @@ namespace wiVersion
 	{
 		return revision;
 	}
-	std::string GetVersionString()
+	const std::string& GetVersionString()
 	{
-		std::stringstream ss("");
-		ss << GetMajor() << "." << GetMinor() << "." << GetRevision();
-		return ss.str();
+		return version_string;
 	}
 
 }
diff --git a/WickedEngine/wiVersion.h b/WickedEngine/wiVersion.h
index ff45b15e4..b2537a4fa 100644
--- a/WickedEngine/wiVersion.h
+++ b/WickedEngine/wiVersion.h
@@ -14,7 +14,7 @@ namespace wiVersion
 	int GetMinor();
 	// minor bug fixes, alterations
 	int GetRevision();
-	std::string GetVersionString();
+	const std::string& GetVersionString();
 }
 
 #endif // WICKEDENGINE_VERSION_DEFINED