Fix commands using channels with spaces in name