Update to make compatible with the heavy use of ports