Index: generic/xotclInt.h
===================================================================
diff -u -rf4cb2e4e7480820bada88c519980cfb0a4d3f1be -r6d8f5916b802c8890df470326886526a4b62c8a4
--- generic/xotclInt.h	(.../xotclInt.h)	(revision f4cb2e4e7480820bada88c519980cfb0a4d3f1be)
+++ generic/xotclInt.h	(.../xotclInt.h)	(revision 6d8f5916b802c8890df470326886526a4b62c8a4)
@@ -12,8 +12,8 @@
 #define _xotcl_int_h_
 
 #if defined(HAVE_STDINT_H)
-/*# define intptr_t intptr_t*/
 # define HAVE_INTPTR_T 
+# define HAVE_UINTPTR_T 
 #endif
 
 #include <tclInt.h>
Index: library/serialize/Serializer.xotcl
===================================================================
diff -u -r1f0231a5c7cbb8dfef4eaf78335c9ad571863660 -r6d8f5916b802c8890df470326886526a4b62c8a4
--- library/serialize/Serializer.xotcl	(.../Serializer.xotcl)	(revision 1f0231a5c7cbb8dfef4eaf78335c9ad571863660)
+++ library/serialize/Serializer.xotcl	(.../Serializer.xotcl)	(revision 6d8f5916b802c8890df470326886526a4b62c8a4)
@@ -223,7 +223,7 @@
 	if {[::xotcl::dispatch $o ::array exists $v]} {
 	  lappend setcmd array set $v [::xotcl::dispatch $o ::array get .$v]
 	} else {
-	  lappend setcmd set $v [::xotcl::instvar $o $v]
+	  lappend setcmd set $v [::xotcl::setinstvar $o $v]
 	}
 	incr nrVars
 	append cmd \t [my pcmd $setcmd] " \\\n"