Fixes messages
Merge branch 'dev'