Updated with new channel files, after recent fixes.