Fix rendering for the new usages