Include final and static where appropriate in Messages
Fix a typo