Fix some command stuff.