mapi tool fixes