Fixing XML syntax errors

@LaurentGoderre First batch of xml syntax fixes.  I'll keep working through the demos.