diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index cd3891dc..7dec7839 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -197,7 +197,7 @@ void Searching::displaySectionCentered(int posStart, int posEnd, ScintillaEditVi
 	pEditView->execute(SCI_SETANCHOR, posStart);	
 }
 
-LONG FindReplaceDlg::originalFinderProc = NULL;
+LONG_PTR FindReplaceDlg::originalFinderProc = NULL;
 
 void FindReplaceDlg::addText2Combo(const TCHAR * txt2add, HWND hCombo, bool)
 {	
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
index 52a436c0..5e1f1b4a 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
@@ -308,7 +308,7 @@ protected :
 	virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
 	void addText2Combo(const TCHAR * txt2add, HWND comboID, bool isUTF8 = false);
 	generic_string getTextFromCombo(HWND hCombo, bool isUnicode = false) const;
-	static LONG originalFinderProc;
+	static LONG_PTR originalFinderProc;
 
 	// Window procedure for the finder
 	static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index f218b83e..0fbb5c04 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -83,7 +83,7 @@ class NppParameters;
 #define NB_WORD_LIST 4
 #define WORD_LIST_LEN 256
 
-typedef int (* SCINTILLA_FUNC) (void*, int, int, int);
+typedef sptr_t(*SCINTILLA_FUNC) (void *, unsigned int, uptr_t, sptr_t);
 typedef void * SCINTILLA_PTR;
 
 #define WM_DOCK_USERDEFINE_DLG      (SCINTILLA_USER + 1)
@@ -238,7 +238,7 @@ public:
 	virtual void init(HINSTANCE hInst, HWND hPere);
 
 	LRESULT execute(UINT Msg, WPARAM wParam=0, LPARAM lParam=0) const {
-		return _pScintillaFunc(_pScintillaPtr, static_cast<int>(Msg), static_cast<int>(wParam), static_cast<int>(lParam));
+		return _pScintillaFunc(_pScintillaPtr, Msg, wParam, lParam);
 	};
 	
 	void activateBuffer(BufferID buffer);
diff --git a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
index 9b87a8d2..57d7270b 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
+++ b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
@@ -49,7 +49,7 @@ public :
 	};
 
 	void setCursorColour(COLORREF coulour) {
-		::SendMessage(_hSelf, BGM_SETCURSORCOLOR, (UINT)coulour, 0);
+		::SendMessage(_hSelf, BGM_SETCURSORCOLOR, (WPARAM)coulour, 0);
 	};
 
 	void hideCursor() {
@@ -64,7 +64,7 @@ public :
 		_BGCELL cell;
 		cell.row = row;
 		cell.col = col;
-		::SendMessage(_hSelf, BGM_SETCELLDATA, (UINT)&cell, (long)text);
+		::SendMessage(_hSelf, BGM_SETCELLDATA, (WPARAM)&cell, (LPARAM)text);
 	};
 
 	void makeColAutoWidth(bool autoWidth = true) {
@@ -79,7 +79,7 @@ public :
 		_BGCELL cell;
 		cell.row = row;
 		cell.col = col;
-		::SendMessage(_hSelf, BGM_DELETECELL, (UINT)&cell, 0);
+		::SendMessage(_hSelf, BGM_DELETECELL, (WPARAM)&cell, 0);
 	};
 
 	void setColWidth(unsigned int col, unsigned int width) {