Minor fixes

@gregcaporaso can you please review?