Corrects scope attributes on commands