More hacky workarounds for bad messages