A Couple Changes to TFM that might not be enough for a Pull