Configurable channels, minor cleanups