Minor changes to message primitives