Tweaks to previous commit

Thanks @jeffdoggett.