Minor changes to TFIOS