Fixed specs, fixed XML generation