Those TODOs should be fixed