#various fixes to deal with new message situations