Fixed some lint issues in xml.