XML related fixed for the merge