Sal Scotto:
	- Fix for channel names when blizz timestamps are enabled.
	- Added back in a local that got removed by mistake
