Bug fixes - missing messages