diff --git a/samples/CSharpCodeCompletion/CodeCompletionProvider.cs b/samples/CSharpCodeCompletion/CodeCompletionProvider.cs
index b7c62ad7a9..859834569a 100644
--- a/samples/CSharpCodeCompletion/CodeCompletionProvider.cs
+++ b/samples/CSharpCodeCompletion/CodeCompletionProvider.cs
@@ -94,8 +94,8 @@ namespace CSharpEditor
 			
 			NRefactoryResolver resolver = new NRefactoryResolver(mainForm.myProjectContent, mainForm.myProjectContent.Language);
 			Dom.ResolveResult rr = resolver.Resolve(FindExpression(textArea),
-			                                        textArea.Caret.Line,
-			                                        textArea.Caret.Column,
+			                                        textArea.Caret.Line + 1,
+			                                        textArea.Caret.Column + 1,
 			                                        fileName,
 			                                        textArea.MotherTextEditorControl.Text);
 			List<ICompletionData> resultList = new List<ICompletionData>();
diff --git a/samples/CSharpCodeCompletion/MainForm.cs b/samples/CSharpCodeCompletion/MainForm.cs
index 8d7605f47c..85ca039abe 100644
--- a/samples/CSharpCodeCompletion/MainForm.cs
+++ b/samples/CSharpCodeCompletion/MainForm.cs
@@ -80,6 +80,7 @@ class MainClass
 ";
 			textEditorControl1.SetHighlighting("C#");
 			textEditorControl1.ShowEOLMarkers = false;
+			textEditorControl1.ShowInvalidLines = false;
 			HostCallbackImplementation.Register(this);
 			CodeCompletionKeyHandler.Attach(this, textEditorControl1);
 			ToolTipProvider.Attach(this, textEditorControl1);
@@ -118,11 +119,13 @@ class MainClass
 				"System", "System.Data", "System.Drawing", "System.Xml", "System.Windows.Forms"
 			};
 			foreach (string assemblyName in referencedAssemblies) {
-				{ // block for anonymous method
-					string assemblyNameCopy = assemblyName;
-					BeginInvoke(new MethodInvoker(delegate { parserThreadLabel.Text = "Loading " + assemblyNameCopy + "..."; }));
+				string assemblyNameCopy = assemblyName; // copy for anonymous method
+				BeginInvoke(new MethodInvoker(delegate { parserThreadLabel.Text = "Loading " + assemblyNameCopy + "..."; }));
+				Dom.IProjectContent referenceProjectContent = pcRegistry.GetProjectContentForReference(assemblyName, assemblyName);
+				myProjectContent.AddReferencedContent(referenceProjectContent);
+				if (referenceProjectContent is Dom.ReflectionProjectContent) {
+					(referenceProjectContent as Dom.ReflectionProjectContent).InitializeReferences();
 				}
-				myProjectContent.AddReferencedContent(pcRegistry.GetProjectContentForReference(assemblyName, assemblyName));
 			}
 			BeginInvoke(new MethodInvoker(delegate { parserThreadLabel.Text = "Ready"; }));
 			
diff --git a/samples/CSharpCodeCompletion/ToolTipProvider.cs b/samples/CSharpCodeCompletion/ToolTipProvider.cs
index 61fa8f004e..a206c1ebf5 100644
--- a/samples/CSharpCodeCompletion/ToolTipProvider.cs
+++ b/samples/CSharpCodeCompletion/ToolTipProvider.cs
@@ -64,8 +64,8 @@ namespace CSharpEditor
 				TextEditor.TextArea textArea = editor.ActiveTextAreaControl.TextArea;
 				NRefactoryResolver resolver = new NRefactoryResolver(mainForm.myProjectContent, mainForm.myProjectContent.Language);
 				ResolveResult rr = resolver.Resolve(expression,
-				                                    textArea.Caret.Line,
-				                                    textArea.Caret.Column,
+				                                    e.LogicalPosition.Y + 1,
+				                                    e.LogicalPosition.X + 1,
 				                                    MainForm.DummyFileName,
 				                                    textArea.MotherTextEditorControl.Text);
 				string toolTipText = GetText(rr);