Reduce text differences with the old version (Visual Studio being mean!)