Fixes for broken messages