Reply to TODO comments