[Global] Minor fixes to Messages system
[Global] Fix to custom events