fixes to work with new messages