Some more TODD

Signed-off-by: Jean-Denis Vauguet <jd@vauguet.fr>