Fixed a few json keys for the messaging system