diff --git a/installer/innosetup/setup.iss b/installer/innosetup/setup.iss
index e82377008..31a0035f2 100644
--- a/installer/innosetup/setup.iss
+++ b/installer/innosetup/setup.iss
@@ -39,7 +39,7 @@ Source: {#ReleaseDir}\System.Numerics.Vectors.dll; DestDir: {app}; Components: g
 Source: {#ReleaseDir}\System.Runtime.CompilerServices.Unsafe.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
 Source: {#ReleaseDir}\System.Buffers.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
 Source: {#ReleaseDir}\TwemojiMozilla.ttf.gz; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
-Source: {#ReleaseDir}\emoji-test.txt.gz; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
+Source: {#ReleaseDir}\emojis.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
 Source: {#GreenshotProjectDir}\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion
 Source: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
 ;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
diff --git a/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj b/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
index 9fa6da494..4b229e7d7 100644
--- a/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
+++ b/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
@@ -1,9 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" version="17.3.2" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" version="17.3.2"/>
     <PackageReference Include="SixLabors.ImageSharp.Drawing" version="1.0.0-beta15" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Greenshot.Editor\Greenshot.Editor.csproj" />
   </ItemGroup>
+  <Target Name="CleanupBuildAssemblies" AfterTargets="AfterBuild">
+    <Exec Command="del $(TargetDir)\Microsoft.Build.*.dll" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 5d7356e18..53ff2fe71 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -65,7 +65,7 @@
     </Task>
   </UsingTask>
 
-  <UsingTask TaskName="EmojiDataTask" AssemblyFile="..\Greenshot.BuildTasks\bin\Debug\net472\Greenshot.BuildTasks.dll" />
+  <UsingTask TaskName="EmojiDataTask" TaskFactory="TaskHostFactory" AssemblyFile="..\Greenshot.BuildTasks\bin\Debug\net472\Greenshot.BuildTasks.dll" />
 
   <Target Name="GenerateEmojiTestTxtFile" BeforeTargets="BeforeBuild">
     <EmojiDataTask EmojiTestTxtFile="..\Greenshot.Editor\Controls\Emoji\emoji-test.txt" OutputFilename="$(SolutionDir)$(SolutionName)\$(OutDir)\emojis.xml" />