diff --git a/src/AvaloniaEdit.Demo/App.xaml b/src/AvaloniaEdit.Demo/App.xaml
index cac279c1..8ab1b622 100644
--- a/src/AvaloniaEdit.Demo/App.xaml
+++ b/src/AvaloniaEdit.Demo/App.xaml
@@ -13,7 +13,7 @@
         <ControlTemplate>
           <cc:CompletionListBox Name="PART_ListBox" Background="Gray" BorderThickness="1" BorderBrush="LightGray" >
             <cc:CompletionListBox.ItemTemplate>
-              <DataTemplate>
+              <DataTemplate x:DataType="cc:ICompletionData">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Height="18">
                   <Image Source="{Binding Image}"
                          Width="15"
diff --git a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
index eda2071b..fe826f14 100644
--- a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
+++ b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
@@ -6,6 +6,7 @@
     <RuntimeIdentifiers>win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 790e8d4f..15a6baf6 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -6,6 +6,7 @@
     <PackageId>Avalonia.AvaloniaEdit</PackageId>
     <Description>This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,4 +42,4 @@
       </ReferencePath>
     </ItemGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/AvaloniaEdit/CodeCompletion/CompletionList.xaml b/src/AvaloniaEdit/CodeCompletion/CompletionList.xaml
index 2b286a0b..7f7e3c00 100644
--- a/src/AvaloniaEdit/CodeCompletion/CompletionList.xaml
+++ b/src/AvaloniaEdit/CodeCompletion/CompletionList.xaml
@@ -8,8 +8,8 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <cc:CompletionListBox Name="PART_ListBox" FontSize="11">
-                    <cc:CompletionListBox.ItemTemplate>                       
-                        <DataTemplate>
+                    <cc:CompletionListBox.ItemTemplate>
+                        <DataTemplate x:DataType="cc:ICompletionData">
                             <StackPanel Orientation="Horizontal" Margin="0">
                                 <Image Source="{Binding Image}"
                                        Width="16"