Minor changes
xml things