Update cmd fixes
Update fixes