ZPU: Packet router fixup.

This commit must be merged with previous.