TDISP fixes - by Frysk