Minor fixes to standardize message contents.