diff --git a/samples/mdi/makefile.nt b/samples/mdi/makefile.nt
index 7e0b86c583..c79a4f8d78 100644
--- a/samples/mdi/makefile.nt
+++ b/samples/mdi/makefile.nt
@@ -13,7 +13,7 @@
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
-WXUSINGDLL=1
+WXUSINGDLL=0
 
 !include $(WXDIR)\src\ntwxwin.mak
 
diff --git a/samples/minimal/makefile.nt b/samples/minimal/makefile.nt
index 05af65af8a..0416630669 100644
--- a/samples/minimal/makefile.nt
+++ b/samples/minimal/makefile.nt
@@ -14,7 +14,7 @@
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-WXUSINGDLL=1
+WXUSINGDLL=0
 
 !include $(WXDIR)\src\ntwxwin.mak
 
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 6b4b2317b5..aa41b2d722 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -407,8 +407,10 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       long& _cookie) const
 {
-    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd,
-                                                    (HTREEITEM) (WXHTREEITEM)_cookie));
+    wxTreeItemId l=wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd,
+                (HTREEITEM) (WXHTREEITEM)_cookie));
+    _cookie=(long)l;
+    return l;
 }
 
 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const