Fix XML formatting (among others)