PortForwardManager: incorporate review comments