Fix the bugs appeared after last PR

Same here, please use 2 spaces for XML content.

Regardless of what tool you use for automatic indentation, please configure it accordingly, otherwise code becomes hard to read.