more forwarding fixes