art:  Few hacks to get working on TP

Need to dig into these on why it's needed