Fixes in TD01.