diff --git a/uppsrc/Core/Stream.h b/uppsrc/Core/Stream.h
index 485de7e47..51dd7e6ff 100644
--- a/uppsrc/Core/Stream.h
+++ b/uppsrc/Core/Stream.h
@@ -468,7 +468,7 @@ protected:
 public:
 	operator int64() const            { return GetSize(); }
 
-	void     Open()                   { ptr = buffer; size = 0; }
+	void     Open()                   { ptr = buffer; size = 0; ClearError(); }
 
 	SizeStream();
 };
diff --git a/uppsrc/CtrlLib/ToolButton.cpp b/uppsrc/CtrlLib/ToolButton.cpp
index 69ebd0c14..a17fa5af0 100644
--- a/uppsrc/CtrlLib/ToolButton.cpp
+++ b/uppsrc/CtrlLib/ToolButton.cpp
@@ -54,10 +54,6 @@ ToolButton::~ToolButton() {}
 
 void ToolButton::Reset()
 {
-	Tip("");
-	Help("");
-	Topic("");
-	Description("");
 	repeat = false;
 	accel = 0;
 	checked = false;
@@ -65,6 +61,10 @@ void ToolButton::Reset()
 	minsize = Size(0, 0);
 	maxiconsize = Size(INT_MAX, INT_MAX);
 	style = &StyleDefault();
+	Tip("");
+	Help("");
+	Topic("");
+	Description("");
 }
 
 void ToolButton::UpdateTip()
diff --git a/uppsrc/Docking/ToolWin.cpp b/uppsrc/Docking/ToolWin.cpp
index d35990c24..921097ead 100644
--- a/uppsrc/Docking/ToolWin.cpp
+++ b/uppsrc/Docking/ToolWin.cpp
@@ -223,6 +223,7 @@ ToolWin::ToolWin()
 	Add(close);
 	close.Image(CtrlImg::cross());
 	close <<= THISBACK(DoClose);
+	close.Tip(t_("Close"));
 	AddFrame(*this);
 	Sizeable();
 	FrameLess();