Messages fixes
Merge https://github.com/sommar/afx