Fixes for TP