Updated some files to match latest tfs changes
Merge pull request #674 from EPuncker/master

Updated some files to match latest tfs changes