Pushing XML fixes

Fixes for XML problems that ruin our GitHub experience.