Fixing errors in Commands