Fix usages