work on fixing xml parsing errors

Change-Id: I04f82fda34d49129cf041f887ec018808503f744