Fixed scoped commands to avoid allowing redundant scopes