Tweaks.
Merge pull request #1 from adobe/larz/tweaks

Tweaks.