Work on unregistered channels; fixes