Fix several commands