Fixing some command stuff