Make commands buffer local