Minor TiC Cleanup

I made a few wrong additions/changes in my last TiC commit.