Added some fixes in Message