diff --git a/uppsrc/Core/Rpc/Rpc.h b/uppsrc/Core/Rpc/Rpc.h
index 455b98847..b93e428e1 100644
--- a/uppsrc/Core/Rpc/Rpc.h
+++ b/uppsrc/Core/Rpc/Rpc.h
@@ -196,8 +196,11 @@ struct RpcGet {
 	Value v;
 	
 	template <class T>
-	operator T() { T x; ValueGet(x, v); return x; }
-	
+	operator T() const { T x; ValueGet(x, v); return x; }
+
+	template <class T>
+	T Get() const { T x; ValueGet(x, v); return x; } // Ugly workaround for MSC compiler bug
+
 	String ToString() const { return v.ToString(); }
 };
 
diff --git a/uppsrc/RichEdit/HeaderFooter.cpp b/uppsrc/RichEdit/HeaderFooter.cpp
index 3011cd7d1..63cf7c927 100644
--- a/uppsrc/RichEdit/HeaderFooter.cpp
+++ b/uppsrc/RichEdit/HeaderFooter.cpp
@@ -42,12 +42,8 @@ void RichEditHdrFtr::TheBar(Bar& bar)
 
 void RichEditHdrFtr::PageNumber()
 {
-	DLOG("PAGENUMBER");
-	DDUMP(GetCursor());
 	PasteText(ParseQTF("{:VALUE:PAGENUMBER:}"));
-	DDUMP(GetCursor());
 	EvaluateFields();
-	DDUMP(GetCursor());
 }
 
 void RichEditHdrFtr::PageCount()
diff --git a/uppsrc/RichEdit/Modify.cpp b/uppsrc/RichEdit/Modify.cpp
index ae4537d4b..3694a1a56 100644
--- a/uppsrc/RichEdit/Modify.cpp
+++ b/uppsrc/RichEdit/Modify.cpp
@@ -295,10 +295,7 @@ void RichEdit::PasteText(const RichText& text)
 	RemoveSelection();
 	Insert(cursor, text, false);
 	ReadStyles();
-	DDUMP(text.GetLength());
-	DDUMP(cursor);
 	Move(cursor + text.GetLength(), false);
-	DDUMP(cursor);
 }
 
 struct ToParaIterator : RichText::Iterator {