art:  Few hacks to get working on TP

Need to dig into these on why it's needed

Change-Id: Ie2c2598dc5064e79e5ab5626226450b1824fe3df