Fix for port and scheme forwarding