Combine MessageUtils and RelayUtils (only needed in NAT module)

+ other minor corrections