[PATCH v4 0/2] Fix build of forwarder, then improve it