Fixes to message classes.