TODOs, adapted to newest libs