Dispatch and Control Fixes added.