Fix for ControlChannel; misc changes