Fixes TODO-consistency