Merge pull request #1069 from afs/small-changes

Small changes