Minor changes to clean things up a bit.
Think TT is broken.