Adding missing forwarding headers