diff --git a/SamTFE/Sources/Modeler/ColoredButton.cpp b/SamTFE/Sources/Modeler/ColoredButton.cpp
index f6609c33..ceba5067 100644
--- a/SamTFE/Sources/Modeler/ColoredButton.cpp
+++ b/SamTFE/Sources/Modeler/ColoredButton.cpp
@@ -293,7 +293,7 @@ INT_PTR CColoredButton::OnToolHitTest( CPoint point, TOOLINFO* pTI ) const
   rectToolTip.top = 50;
   rectToolTip.bottom = 60;
   pTI->hwnd = GetParent()->m_hWnd;
-  pTI->uId = (UINT) m_hWnd;
+  pTI->uId = (DWORD_PTR) m_hWnd;
   pTI->rect = rectToolTip;
   pTI->uFlags = TTF_IDISHWND;
   return 1;
diff --git a/SamTFE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp b/SamTFE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp
index 88812a8c..dec51caf 100644
--- a/SamTFE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp
+++ b/SamTFE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp
@@ -89,7 +89,7 @@ BOOL CDlgMarkLinkedSurfaces::OnInitDialog()
     CTString strListEntry;
     strListEntry.PrintF("%.02d %s (%d)", iSurface, ms.ms_Name, ms.ms_aiPolygons.Count());
     int iAddedAs = m_listSurfaces.AddString( CString(strListEntry));
-    m_listSurfaces.SetItemData( iAddedAs, (ULONG) &ms);
+    m_listSurfaces.SetItemData( iAddedAs, (DWORD_PTR) &ms);
     if( ms.ms_ulRenderingFlags&SRF_SELECTED) m_listSurfaces.SetCheck( iAddedAs, 1);
     else m_listSurfaces.SetCheck( iAddedAs, 0);
   }
diff --git a/SamTSE/Sources/Modeler/ColoredButton.cpp b/SamTSE/Sources/Modeler/ColoredButton.cpp
index f6609c33..ceba5067 100644
--- a/SamTSE/Sources/Modeler/ColoredButton.cpp
+++ b/SamTSE/Sources/Modeler/ColoredButton.cpp
@@ -293,7 +293,7 @@ INT_PTR CColoredButton::OnToolHitTest( CPoint point, TOOLINFO* pTI ) const
   rectToolTip.top = 50;
   rectToolTip.bottom = 60;
   pTI->hwnd = GetParent()->m_hWnd;
-  pTI->uId = (UINT) m_hWnd;
+  pTI->uId = (DWORD_PTR) m_hWnd;
   pTI->rect = rectToolTip;
   pTI->uFlags = TTF_IDISHWND;
   return 1;
diff --git a/SamTSE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp b/SamTSE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp
index 88812a8c..dec51caf 100644
--- a/SamTSE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp
+++ b/SamTSE/Sources/Modeler/DlgMarkLinkedSurfaces.cpp
@@ -89,7 +89,7 @@ BOOL CDlgMarkLinkedSurfaces::OnInitDialog()
     CTString strListEntry;
     strListEntry.PrintF("%.02d %s (%d)", iSurface, ms.ms_Name, ms.ms_aiPolygons.Count());
     int iAddedAs = m_listSurfaces.AddString( CString(strListEntry));
-    m_listSurfaces.SetItemData( iAddedAs, (ULONG) &ms);
+    m_listSurfaces.SetItemData( iAddedAs, (DWORD_PTR) &ms);
     if( ms.ms_ulRenderingFlags&SRF_SELECTED) m_listSurfaces.SetCheck( iAddedAs, 1);
     else m_listSurfaces.SetCheck( iAddedAs, 0);
   }