Fixes with message iteration