Minor changes in message handling