Suggestions from Mike. Fixes #1062.
Merge pull request #1064 from afred/ftv-tweaks-1062

Suggestions from Mike. Fixes #1062.