Merging a little bit of .xml tweaking