tweak rebuild msgs