Fix extra cell broadcast messages