Fix usage xml definition -- ongoing tweaking