Make some tweaks on message