Here are a couple of small fixes I noticed while working on notmuch-restore. I think the optind increment is harmless (although confusing) and the other is just correcting an error message.