Fix more problems with invalid xml.
Version 2.6.4