Fix general command bugs