Trivial port forwarding fixes from Jacob