2.16 changes and a TP bugfix.