Merge pull request #692 from jcushman/tweaks

Pulling this in since it's super harmless.