Updated some usages.