Support for recent port changes.