Fixed forwarding and handling messages directed to the mappers.

3 files changed