Fix messages

fix messages