fix several commands