Fixes Messages
Merge branch 'carlos'