Fixes to deal with control port.