Fix for new KeyedMessage class types