Fixing up channels-manager