Fix many other commands