Fix minor issues.
Revert changes in command.