Various changes needed to make project ready for implementation of dynamic tcp control