Fix buglets to do with missing headers in message display