Fix some of commands