Minor improvements to tf-13