fixed import issues in tfs.