Updated some files to match latest tfs changes