Fixing messaging component merge issues