Tweaks from pull request comments

@talbs @frrrances