Fixing errors in Commands

@medo , engz