diff --git a/Aaru.Tui/Aaru.Tui.csproj b/Aaru.Tui/Aaru.Tui.csproj
index 4db8eebc7..a8dd20446 100644
--- a/Aaru.Tui/Aaru.Tui.csproj
+++ b/Aaru.Tui/Aaru.Tui.csproj
@@ -9,6 +9,7 @@
     <SelfContained>true</SelfContained>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml b/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml
index ca8e74533..8ce861662 100644
--- a/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml
@@ -12,6 +12,7 @@
                              Width="40"
                              WindowStartupLocation="CenterScreen"
                              x:Class="Aaru.Tui.Views.Dialogs.GoToPathDialog"
+                             x:DataType="dialogs:GoToPathDialogViewModel"
                              Title="{x:Static localization:Resources.GoToPath_Title}">
     <Design.DataContext>
         <dialogs:GoToPathDialogViewModel />
diff --git a/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml b/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml
index f2ac0319e..97b8d736a 100644
--- a/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml
@@ -14,6 +14,7 @@
                              Height="11"
                              WindowStartupLocation="CenterScreen"
                              CanResize="False"
+                             x:DataType="dialogs:HexViewHelpDialogViewModel"
                              Title="{x:Static localization:Resources.Help_Title}">
     <Design.DataContext>
         <dialogs:HexViewHelpDialogViewModel />
diff --git a/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml b/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml
index 709ad94f6..4780c1a2e 100644
--- a/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml
@@ -14,6 +14,7 @@
                              Height="8"
                              WindowStartupLocation="CenterScreen"
                              CanResize="False"
+                             x:DataType="dialogs:ImageHelpDialogViewModel"
                              Title="{x:Static localization:Resources.Help_Title}">
     <Design.DataContext>
         <dialogs:ImageHelpDialogViewModel />
diff --git a/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml b/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml
index ab61aec59..4505dc9b4 100644
--- a/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml
@@ -14,6 +14,7 @@
                              Height="8"
                              WindowStartupLocation="CenterScreen"
                              CanResize="False"
+                             x:DataType="dialogs:MainHelpDialogViewModel"
                              Title="{x:Static localization:Resources.Help_Title}">
     <Design.DataContext>
         <dialogs:MainHelpDialogViewModel />
diff --git a/Aaru.Tui/Views/Windows/ImageWindow.axaml b/Aaru.Tui/Views/Windows/ImageWindow.axaml
index 1ddf0ca2e..b28006d12 100644
--- a/Aaru.Tui/Views/Windows/ImageWindow.axaml
+++ b/Aaru.Tui/Views/Windows/ImageWindow.axaml
@@ -10,7 +10,7 @@
              d:DesignWidth="800"
              d:DesignHeight="450"
              x:Class="Aaru.Tui.Views.Windows.ImageWindow"
-             x:DataType="windows:HexViewWindowViewModel"
+             x:DataType="windows:ImageWindowViewModel"
              mvvm:ViewModelLocator.AutoWireViewModel="True">
     <Design.DataContext>
         <windows:ImageWindowViewModel />