Fixes to keep ConEmu.xml clean