diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index a4b57116f..7297f7d17 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -281,14 +281,14 @@ void PluginsManager::setMenu(HMENU hMenu, const TCHAR *menuName)
 				if (_pluginInfos[i]->_funcItems[j]._pShKey)
 				{
 					ShortcutKey & sKey = *(_pluginInfos[i]->_funcItems[j]._pShKey);
-					PluginCmdShortcut pcs(Shortcut(itemName.c_str(), sKey._isCtrl, sKey._isAlt, sKey._isShift, sKey._key), (unsigned char)cmdID, _pluginInfos[i]->_moduleName, (unsigned short)j);
+					PluginCmdShortcut pcs(Shortcut(itemName.c_str(), sKey._isCtrl, sKey._isAlt, sKey._isShift, sKey._key), cmdID, _pluginInfos[i]->_moduleName, (unsigned short)j);
 					pluginCmdSCList.push_back(pcs);
 					itemName += TEXT("\t");
 					itemName += pcs.toString();
 				}
 				else
 				{	//no ShortcutKey is provided, add an disabled shortcut (so it can still be mapped, Paramaters class can still index any changes and the toolbar wont funk out
-					PluginCmdShortcut pcs(Shortcut(itemName.c_str(), false, false, false, 0x00), (unsigned char)cmdID, _pluginInfos[i]->_moduleName, (unsigned short)j);	//VK_NULL and everything disabled, the menu name is left alone
+					PluginCmdShortcut pcs(Shortcut(itemName.c_str(), false, false, false, 0x00), cmdID, _pluginInfos[i]->_moduleName, (unsigned short)j);	//VK_NULL and everything disabled, the menu name is left alone
 					pluginCmdSCList.push_back(pcs);
 				}
 				::InsertMenu(_pluginInfos[i]->_pluginMenu, j, MF_BYPOSITION, cmdID, itemName.c_str());
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index 097e5bf49..b68f2eddd 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -1636,7 +1636,7 @@ void NppParameters::feedShortcut(TiXmlNode *node)
 			int len = (int)_shortcuts.size();
 			for(int i = 0; i < len; i++) 
 			{
-				if (_shortcuts[i].getID() == (unsigned short)id) 
+				if (_shortcuts[i].getID() == (unsigned long)id) 
 				{	//found our match
 					getShortcuts(childNode, _shortcuts[i]);
 					addUserModifiedIndex(i);
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 01d041818..b84ec7539 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -18,9 +18,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.4.4")
-#define VERSION_VALUE TEXT("5.44\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
-#define VERSION_DIGITALVALUE 5, 4, 4, 0
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.4.5")
+#define VERSION_VALUE TEXT("5.45\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
+#define VERSION_DIGITALVALUE 5, 4, 5, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")