Address comments from @gregcaporaso