Some fixes to add namespace to network messages.