Fix forwarding issues.