Fixes that add decoding of messages