PortForwardManager fixes + tidies