forwarder: Fix bugs.

Credits to Alex.