Minor TP and timer tweaks.