Update some more messages
Fix compilation warnings