Fix issues with FetchMessages