diff --git a/ChangeLog b/ChangeLog
index 8636233e2..4d2013576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-22  Mike Kestner  <mkestner@novell.com>
+
+	* sample/GtkDemo/DemoHyperText.cs : replace PersistentData usage that
+	breaks on csc.
+	* sample/GtkDemo/DemoTreeStore.cs : fix a 2.0 usage.
+
 2005-06-22  Mike Kestner  <mkestner@novell.com>
 
 	* generator/ManagedCallString.cs : don't assume ref for structs.
diff --git a/sample/GtkDemo/DemoHyperText.cs b/sample/GtkDemo/DemoHyperText.cs
index 656f4de29..c97f92b13 100644
--- a/sample/GtkDemo/DemoHyperText.cs
+++ b/sample/GtkDemo/DemoHyperText.cs
@@ -7,6 +7,7 @@
  */
 
 using System;
+using System.Collections;
 using Gtk;
 
 namespace GtkDemo
@@ -40,6 +41,8 @@ namespace GtkDemo
 			ShowAll ();
 		}
 
+		Hashtable tag_pages = new Hashtable ();
+
 		// Inserts a piece of text into the buffer, giving it the usual
 		// appearance of a hyperlink in a web browser: blue and underlined.
 		// Additionally, attaches some data on the tag, to make it recognizable
@@ -49,7 +52,7 @@ namespace GtkDemo
 			TextTag tag = new TextTag (null);
 			tag.Foreground = "blue";
 			tag.Underline = Pango.Underline.Single;
-			tag.PersistentData.Add ("page", page);
+			tag_pages [tag] = page;
 			buffer.TagTable.Add (tag);
 			buffer.InsertWithTags (ref iter, text, tag);
 		}
@@ -97,7 +100,7 @@ namespace GtkDemo
 		void FollowIfLink (TextView view, TextIter iter)
 		{
 			foreach (TextTag tag in iter.Tags) {
-				object page = tag.PersistentData ["page"];
+				object page = tag_pages [tag];
 				if (page is int)
 					ShowPage (view.Buffer, (int)page);
 			}
@@ -112,7 +115,7 @@ namespace GtkDemo
 			TextIter iter = view.GetIterAtLocation (x, y);
 
 			foreach (TextTag tag in iter.Tags) {
-				if (tag.PersistentData ["page"] is int) {
+				if (tag_pages [tag] is int) {
 					hovering = true;
 					break;
 				}
diff --git a/sample/GtkDemo/DemoTreeStore.cs b/sample/GtkDemo/DemoTreeStore.cs
index 102a2d8d3..3b9a0fd08 100644
--- a/sample/GtkDemo/DemoTreeStore.cs
+++ b/sample/GtkDemo/DemoTreeStore.cs
@@ -46,7 +46,7 @@ namespace GtkDemo
 			sw.Add (treeView);
 
 			// expand all rows after the treeview widget has been realized
-			treeView.Realized += ExpandRows;
+			treeView.Realized += new EventHandler (ExpandRows);
 
 			SetDefaultSize (650, 400);
 			ShowAll ();