diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp
index b056ed6364..89d1b7de91 100644
--- a/src/slic3r/GUI/MarkdownTip.cpp
+++ b/src/slic3r/GUI/MarkdownTip.cpp
@@ -149,7 +149,12 @@ bool MarkdownTip::ShowTip(wxPoint pos, std::string const &tip, std::string const
         // Ensure display size is valid
         if (size.y <= 0) size.y = 600;
         if (pos.y + this->GetSize().y > size.y)
-            pos.y = std::max(0, size.y - this->GetSize().y);
+        {
+            pos.y = 0;
+            if( (size.y - this->GetSize().y) > 0)
+                pos.y = (size.y - this->GetSize().y);
+        }
+            
         this->SetPosition(pos);
         if (tipChanged || _hide) {
             _hide = false;
diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp
index 5c405af516..9a67906dba 100644
--- a/src/slic3r/GUI/WebGuideDialog.cpp
+++ b/src/slic3r/GUI/WebGuideDialog.cpp
@@ -496,7 +496,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
                     }
                 }
 
-                wxGetApp().fltviews().relead_all();
+                wxGetApp().fltviews().reload_all();
             }
 
             this->EndModal(wxID_OK);