Fixes to issues in Outlook