fixes on receive messages