Fix a few new (and one old) issues in the new channel_update