Fix messaging lib