Tweak client messages