Fix usages for xtract