adjustments to support port forwarding