TD8 and small fixes