Fix up TC options