batch IMAP mutation minor fixes