Fixes on the rolling messages