Some changes based on feedback from ecommunities @ github.