Few fixes to message receiving