Improve MSBuild