Guideline and xml doc fixes