Solved couple of small issues related to message type