diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 01a16686d..13e7ad199 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -2914,11 +2914,10 @@ void Notepad_plus::addHotSpot(bool docIsModifing)
 				hotspotStylers.push_back(p);
 				int activeFG = 0xFF0000;
 
-				//TCHAR fontName[256];
 				Style hotspotStyle;
 				
 				hotspotStyle._styleID = style_hotspot;
-				//_pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)fontName);
+				_pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)hotspotStyle._fontName);
 				hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyle);
 				hotspotStyle._bgColor = _pEditView->execute(SCI_STYLEGETBACK, idStyle);
 				hotspotStyle._fontSize = _pEditView->execute(SCI_STYLEGETSIZE, idStyle);
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index bd3396bdd..6aed79ba7 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -386,7 +386,7 @@ void ScintillaEditView::setSpecialStyle(Style & styleToSet)
     if ( styleToSet._colorStyle & COLORSTYLE_BACKGROUND )
 	    execute(SCI_STYLESETBACK, styleID, styleToSet._bgColor);
     
-    if ((!styleToSet._fontName)||(lstrcmp(styleToSet._fontName, TEXT(""))))
+    if (styleToSet._fontName && lstrcmp(styleToSet._fontName, TEXT("")) != 0)
 	{
 #ifdef UNICODE
 		WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
diff --git a/PowerEditor/src/WinControls/ToolTip/ToolTip.h b/PowerEditor/src/WinControls/ToolTip/ToolTip.h
index 9ab496451..aece63dc3 100644
--- a/PowerEditor/src/WinControls/ToolTip/ToolTip.h
+++ b/PowerEditor/src/WinControls/ToolTip/ToolTip.h
@@ -23,8 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <string>
 #include "Notepad_plus.h"
 #include "Window.h"
-#include <commctrl.h>
-
 
 using namespace std;