Update and fix some messages