XML comments fixed