Fixes to Command.