Fixed issues with comments in XML Parser