Bug fixes and cleanup for channel announcement/liveall