Bug fixes and channel events