Fixes in TD02.